diff options
Diffstat (limited to 'src/gui/image/qimageiohandler.h')
-rw-r--r-- | src/gui/image/qimageiohandler.h | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index a4acf9dfe0..ccd215203a 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** 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 #ifndef QIMAGEIOHANDLER_H #define QIMAGEIOHANDLER_H #include <QtGui/qtguiglobal.h> +#include <QtGui/qimage.h> #include <QtCore/qiodevice.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> @@ -69,9 +34,6 @@ public: void setFormat(const QByteArray &format) const; QByteArray format() const; - QT_DEPRECATED_X("Use QImageIOHandler::format() instead") - virtual QByteArray name() const; - virtual bool canRead() const = 0; virtual bool read(QImage *image) = 0; virtual bool write(const QImage &image); @@ -96,9 +58,6 @@ public: OptimizedWrite, ProgressiveScanWrite, ImageTransformation -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - , TransformedByDefault -#endif }; enum Transformation { @@ -126,6 +85,8 @@ public: virtual int currentImageNumber() const; virtual QRect currentImageRect() const; + static bool allocateImage(QSize size, QImage::Format format, QImage *image); + protected: QImageIOHandler(QImageIOHandlerPrivate &dd); QScopedPointer<QImageIOHandlerPrivate> d_ptr; |