diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
commit | 6727ae3172aa7c3a791efd839ebefe24a4b8134c (patch) | |
tree | 63ecf158da5ba45bc5501e7bcaf7f57df2ed56f8 /src/plugins/imageformats/tiff/qtiffhandler_p.h | |
parent | 405bfa87e6f1c5b7fe89efa4b566f99d01375567 (diff) | |
parent | 454fb13c465e29f0d0f9a295bdb822b4a09c7e48 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b
Diffstat (limited to 'src/plugins/imageformats/tiff/qtiffhandler_p.h')
-rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler_p.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/plugins/imageformats/tiff/qtiffhandler_p.h b/src/plugins/imageformats/tiff/qtiffhandler_p.h index d6f2e7b..e07d9c4 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler_p.h +++ b/src/plugins/imageformats/tiff/qtiffhandler_p.h @@ -34,26 +34,28 @@ #ifndef QTIFFHANDLER_P_H #define QTIFFHANDLER_P_H -#include <QtGui/qimageiohandler.h> +#include <QtCore/QScopedPointer> +#include <QtGui/QImageIOHandler> QT_BEGIN_NAMESPACE +class QTiffHandlerPrivate; class QTiffHandler : public QImageIOHandler { public: QTiffHandler(); - bool canRead() const; - bool read(QImage *image); - bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_OVERRIDE; - QByteArray name() const; + QByteArray name() const Q_DECL_OVERRIDE; static bool canRead(QIODevice *device); - QVariant option(ImageOption option) const; - void setOption(ImageOption option, const QVariant &value); - bool supportsOption(ImageOption option) const; + QVariant option(ImageOption option) const Q_DECL_OVERRIDE; + void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE; + bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE; enum Compression { NoCompression = 0, @@ -61,7 +63,7 @@ public: }; private: void convert32BitOrder(void *buffer, int width); - int compression; + const QScopedPointer<QTiffHandlerPrivate> d; }; QT_END_NAMESPACE |