diff options
Diffstat (limited to 'src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp')
| -rw-r--r-- | src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp | 62 |
1 files changed, 14 insertions, 48 deletions
diff --git a/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp b/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp index 2c71c1610a..988a999e19 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvginternalrectanglenode.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 "qsgopenvginternalrectanglenode.h" #include "qsgopenvghelpers.h" @@ -87,17 +51,19 @@ static QGradientStop interpolateStop(const QGradientStop &firstStop, const QGrad double distance = secondStop.first - firstStop.first; double distanceDelta = newPos - firstStop.first; double modifierValue = distanceDelta / distance; - int redDelta = (secondStop.second.red() - firstStop.second.red()) * modifierValue; - int greenDelta = (secondStop.second.green() - firstStop.second.green()) * modifierValue; - int blueDelta = (secondStop.second.blue() - firstStop.second.blue()) * modifierValue; - int alphaDelta = (secondStop.second.alpha() - firstStop.second.alpha()) * modifierValue; + const auto firstStopRgbColor = firstStop.second.toRgb(); + const auto secondStopRgbColor = secondStop.second.toRgb(); + int redDelta = (secondStopRgbColor.red() - firstStopRgbColor.red()) * modifierValue; + int greenDelta = (secondStopRgbColor.green() - firstStopRgbColor.green()) * modifierValue; + int blueDelta = (secondStopRgbColor.blue() - firstStopRgbColor.blue()) * modifierValue; + int alphaDelta = (secondStopRgbColor.alpha() - firstStopRgbColor.alpha()) * modifierValue; QGradientStop newStop; newStop.first = newPos; - newStop.second = QColor(firstStop.second.red() + redDelta, - firstStop.second.green() + greenDelta, - firstStop.second.blue() + blueDelta, - firstStop.second.alpha() + alphaDelta); + newStop.second = QColor(firstStopRgbColor.red() + redDelta, + firstStopRgbColor.green() + greenDelta, + firstStopRgbColor.blue() + blueDelta, + firstStopRgbColor.alpha() + alphaDelta); return newStop; } @@ -107,7 +73,7 @@ void QSGOpenVGInternalRectangleNode::setGradientStops(const QGradientStops &stop //normalize stops bool needsNormalization = false; - for (const QGradientStop &stop : qAsConst(stops)) { + for (const QGradientStop &stop : std::as_const(stops)) { if (stop.first < 0.0 || stop.first > 1.0) { needsNormalization = true; continue; @@ -252,7 +218,7 @@ void QSGOpenVGInternalRectangleNode::render() vgSetParameteri(m_rectanglePaint, VG_PAINT_COLOR_RAMP_PREMULTIPLIED, false); QVector<VGfloat> stops; - for (const QGradientStop &stop : qAsConst(m_gradientStops)) { + for (const QGradientStop &stop : std::as_const(m_gradientStops)) { // offset stops.append(stop.first); // color |