diff options
Diffstat (limited to 'src/gui/image/qpicture.cpp')
| -rw-r--r-- | src/gui/image/qpicture.cpp | 65 |
1 files changed, 15 insertions, 50 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index d469ac8aae..da8c5ef1e5 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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 "qpicture.h" #include <private/qpicture_p.h> @@ -54,7 +18,6 @@ #include "qpainter.h" #include "qpainterpath.h" #include "qpixmap.h" -#include "qregexp.h" #include "qregion.h" #include "qdebug.h" #include <QtCore/private/qlocking_p.h> @@ -258,9 +221,6 @@ void QPicture::setData(const char* data, uint size) Loads a picture from the file specified by \a fileName and returns true if successful; otherwise invalidates the picture and returns \c false. - Please note that the \a format parameter has been deprecated and - will have no effect. - \sa save() */ @@ -293,9 +253,6 @@ bool QPicture::load(QIODevice *dev) Saves a picture to the file specified by \a fileName and returns true if successful; otherwise returns \c false. - Please note that the \a format parameter has been deprecated and - will have no effect. - \sa load() */ @@ -365,6 +322,8 @@ void QPicture::setBoundingRect(const QRect &r) This function does exactly the same as QPainter::drawPicture() with (x, y) = (0, 0). + + \note The state of the painter isn't preserved by this function. */ bool QPicture::play(QPainter *painter) @@ -465,7 +424,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) QPen pen; QBrush brush; QRegion rgn; - QMatrix wmatrix; + qreal wmatrix[6]; QTransform matrix; QTransform worldMatrix = painter->transform(); @@ -820,8 +779,12 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) if (d->formatMajor >= 8) { s >> matrix >> i_8; } else { - s >> wmatrix >> i_8; - matrix = QTransform(wmatrix); + s >> wmatrix[0] >> wmatrix[1] + >> wmatrix[2] >> wmatrix[3] + >> wmatrix[4] >> wmatrix[5] >> i_8; + matrix = QTransform(wmatrix[0], wmatrix[1], + wmatrix[2], wmatrix[3], + wmatrix[4], wmatrix[5]); } // i_8 is always false due to updateXForm() in qpaintengine_pic.cpp painter->setTransform(matrix * worldMatrix, i_8); @@ -851,6 +814,8 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) bool(ul & QPainter::Antialiasing)); painter->setRenderHint(QPainter::SmoothPixmapTransform, bool(ul & QPainter::SmoothPixmapTransform)); + painter->setRenderHint(QPainter::NonCosmeticBrushPatterns, + bool(ul & QPainter::NonCosmeticBrushPatterns)); break; case QPicturePrivate::PdcSetCompositionMode: s >> ul; @@ -1041,10 +1006,10 @@ bool QPicturePrivate::checkFormat() int cs_start = sizeof(quint32); // pos of checksum word int data_start = cs_start + sizeof(quint16); quint16 cs,ccs; - QByteArray buf = pictb.buffer(); // pointer to data + const QByteArray buf = pictb.buffer(); // pointer to data s >> cs; // read checksum - ccs = (quint16) qChecksum(buf.constData() + data_start, buf.size() - data_start); + ccs = (quint16) qChecksum(QByteArrayView(buf.constData() + data_start, buf.size() - data_start)); if (ccs != cs) { qWarning("QPicturePaintEngine::checkFormat: Invalid checksum %x, %x expected", ccs, cs); |