diff options
Diffstat (limited to 'src/svg/qsvgtinydocument.cpp')
| -rw-r--r-- | src/svg/qsvgtinydocument.cpp | 115 |
1 files changed, 54 insertions, 61 deletions
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index 295f535..49a796c 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt SVG 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 "qsvgtinydocument_p.h" @@ -73,13 +37,15 @@ QSvgTinyDocument::~QSvgTinyDocument() } #ifndef QT_NO_COMPRESS +static QByteArray qt_inflateSvgzDataFrom(QIODevice *device, bool doCheckContent = true); # ifdef QT_BUILD_INTERNAL -Q_AUTOTEST_EXPORT QByteArray qt_inflateGZipDataFrom(QIODevice *device); -# else -static QByteArray qt_inflateGZipDataFrom(QIODevice *device); +Q_AUTOTEST_EXPORT QByteArray qt_inflateGZipDataFrom(QIODevice *device) +{ + return qt_inflateSvgzDataFrom(device, false); // autotest wants unchecked result +} # endif -QByteArray qt_inflateGZipDataFrom(QIODevice *device) +static QByteArray qt_inflateSvgzDataFrom(QIODevice *device, bool doCheckContent) { if (!device) return QByteArray(); @@ -130,7 +96,7 @@ QByteArray qt_inflateGZipDataFrom(QIODevice *device) if (oldSize > INT_MAX - CHUNK_SIZE) { inflateEnd(&zlibStream); qCWarning(lcSvgHandler, "Error while inflating gzip file: integer size overflow"); - return destination; + return QByteArray(); } destination.resize(oldSize + CHUNK_SIZE); @@ -147,8 +113,7 @@ QByteArray qt_inflateGZipDataFrom(QIODevice *device) inflateEnd(&zlibStream); qCWarning(lcSvgHandler, "Error while inflating gzip file: %s", (zlibStream.msg != NULL ? zlibStream.msg : "Unknown error")); - destination.chop(zlibStream.avail_out); - return destination; + return QByteArray(); } } @@ -156,6 +121,17 @@ QByteArray qt_inflateGZipDataFrom(QIODevice *device) // it means we have to provide more data, so exit the loop here } while (!zlibStream.avail_out); + if (doCheckContent) { + // Quick format check, equivalent to QSvgIOHandler::canRead() + QByteArray buf = destination.left(16); + if (!buf.contains("<?xml") && !buf.contains("<svg") && !buf.contains("<!--") && !buf.contains("<!DOCTYPE svg")) { + inflateEnd(&zlibStream); + qCWarning(lcSvgHandler, "Error while inflating gzip file: SVG format check failed"); + return QByteArray(); + } + doCheckContent = false; // Run only once, on first chunk + } + if (zlibResult == Z_STREAM_END) { // Make sure there are no more members to process before exiting if (!(zlibStream.avail_in && inflateReset(&zlibStream) == Z_OK)) @@ -169,6 +145,11 @@ QByteArray qt_inflateGZipDataFrom(QIODevice *device) inflateEnd(&zlibStream); return destination; } +#else +static QByteArray qt_inflateSvgzDataFrom(QIODevice *) +{ + return QByteArray(); +} #endif QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName) @@ -180,14 +161,12 @@ QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName) return 0; } -#ifndef QT_NO_COMPRESS if (fileName.endsWith(QLatin1String(".svgz"), Qt::CaseInsensitive) || fileName.endsWith(QLatin1String(".svg.gz"), Qt::CaseInsensitive)) { - return load(qt_inflateGZipDataFrom(&file)); + return load(qt_inflateSvgzDataFrom(&file)); } -#endif - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; QSvgHandler handler(&file); if (handler.ok()) { doc = handler.document(); @@ -202,17 +181,24 @@ QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName) QSvgTinyDocument * QSvgTinyDocument::load(const QByteArray &contents) { -#ifndef QT_NO_COMPRESS + QByteArray svg; // Check for gzip magic number and inflate if appropriate if (contents.startsWith("\x1f\x8b")) { - QBuffer buffer(const_cast<QByteArray *>(&contents)); - return load(qt_inflateGZipDataFrom(&buffer)); + QBuffer buffer; + buffer.setData(contents); + svg = qt_inflateSvgzDataFrom(&buffer); + } else { + svg = contents; } -#endif + if (svg.isNull()) + return nullptr; - QSvgHandler handler(contents); + QBuffer buffer; + buffer.setData(svg); + buffer.open(QIODevice::ReadOnly); + QSvgHandler handler(&buffer); - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; if (handler.ok()) { doc = handler.document(); doc->m_animationDuration = handler.animationDuration(); @@ -226,7 +212,7 @@ QSvgTinyDocument * QSvgTinyDocument::load(QXmlStreamReader *contents) { QSvgHandler handler(contents); - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; if (handler.ok()) { doc = handler.document(); doc->m_animationDuration = handler.animationDuration(); @@ -411,8 +397,16 @@ void QSvgTinyDocument::draw(QPainter *p, QSvgExtraStates &) draw(p); } +static bool isValidMatrix(const QTransform &transform) +{ + qreal determinant = transform.determinant(); + return qIsFinite(determinant); +} + void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect, const QRectF &sourceRect) { + QTransform oldTransform = p->worldTransform(); + QRectF target = targetRect; if (target.isEmpty()) { QPaintDevice *dev = p->device(); @@ -431,11 +425,9 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect, if (source.isEmpty()) source = viewBox(); - if (source != target && !source.isEmpty()) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) + if (source != target && !qFuzzyIsNull(source.width()) && !qFuzzyIsNull(source.height())) { if (m_implicitViewBox || !preserveAspectRatio()) { // Code path used when no view box is set, or IgnoreAspectRatio requested -#endif QTransform transform; transform.scale(target.width() / source.width(), target.height() / source.height()); @@ -444,7 +436,6 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect, target.y() - c2.y()); p->scale(target.width() / source.width(), target.height() / source.height()); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) } else { // Code path used when KeepAspectRatio is requested. This attempts to emulate the default values // of the <preserveAspectRatio tag that's implicitly defined when <viewbox> is used. @@ -463,8 +454,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect, // Apply the view box translation if specified. p->translate(-source.x(), -source.y()); } -#endif } + + if (!isValidMatrix(p->worldTransform())) + p->setWorldTransform(oldTransform); } QRectF QSvgTinyDocument::boundsOnElement(const QString &id) const |