diff options
Diffstat (limited to 'src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp')
| -rw-r--r-- | src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp index ab5cfb48b8..fbc0ac704b 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qsgopenvghelpers.h" #include <cmath> @@ -334,10 +298,12 @@ void qDrawSubImage(VGImage image, const QRectF &sourceRect, const QPointF &destO const QVector<VGfloat> qColorToVGColor(const QColor &color, float opacity) { QVector<VGfloat> vgColor(4); - vgColor[0] = color.redF(); - vgColor[1] = color.greenF(); - vgColor[2] = color.blueF(); - vgColor[3] = color.alphaF() * opacity; + float r, g, b, a; + color.getRgbF(&r, &g, &b, &a); + vgColor[0] = r; + vgColor[1] = g; + vgColor[2] = b; + vgColor[3] = a * opacity; return vgColor; } @@ -420,6 +386,7 @@ QImage::Format qVGImageFormatToQImageFormat(VGImageFormat format) break; case VG_sL_8: qImageFormat = QImage::Format_Grayscale8; + break; default: qImageFormat = QImage::Format_ARGB32; break; |