diff options
author | Andy Maloney <asmaloney@gmail.com> | 2015-01-02 09:48:44 -0500 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-01-09 10:36:08 +0100 |
commit | 163af2cf53d3441b453744b99254c07a175af5de (patch) | |
tree | 43f126bf95d3c776041c1c5df5d15666fa3bdaed /src/gui/image/qimagewriter.cpp | |
parent | fc5e6b37a1c49d150886543f87d6fc1817060534 (diff) |
Add OptimizedWrite & ProgressiveScanWrite options to QImageIOHandler and use for JPEG writing
Exposes two options from libjpeg: the optimize option and progressive scan option.
These are both lossless operations, so they do not change the image's quality.
Using these switches can result in smaller jpeg files.
Task-number: QTBUG-20075
Change-Id: I8d0bd6a712b8a365265b7bd517e136b0755b90cb
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/gui/image/qimagewriter.cpp')
-rw-r--r-- | src/gui/image/qimagewriter.cpp | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index fa261df1a5..0e03c9b215 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -252,6 +252,8 @@ public: QString description; QString text; QByteArray subType; + bool optimizedWrite; + bool progressiveScanWrite; // error QImageWriter::ImageWriterError imageWriterError; @@ -271,6 +273,8 @@ QImageWriterPrivate::QImageWriterPrivate(QImageWriter *qq) quality = -1; compression = 0; gamma = 0.0; + optimizedWrite = false; + progressiveScanWrite = false; imageWriterError = QImageWriter::UnknownError; errorString = QImageWriter::tr("Unknown error"); @@ -555,6 +559,63 @@ QList<QByteArray> QImageWriter::supportedSubTypes() const } /*! + \since 5.5 + + This is an image format-specific function which sets the \a optimize flags when + writing images. For image formats that do not support setting an \a optimize flag, + this value is ignored. + + The default is false. + + \sa optimizedWrite() +*/ +void QImageWriter::setOptimizedWrite(bool optimize) +{ + d->optimizedWrite = optimize; +} + +/*! + \since 5.5 + + Returns whether optimization has been turned on for writing the image. + + \sa setOptimizedWrite() +*/ +bool QImageWriter::optimizedWrite() const +{ + return d->optimizedWrite; +} + +/*! + \since 5.5 + + This is an image format-specific function which turns on \a progressive scanning + when writing images. For image formats that do not support setting a \a progressive + scan flag, this value is ignored. + + The default is false. + + \sa progressiveScanWrite() +*/ + +void QImageWriter::setProgressiveScanWrite(bool progressive) +{ + d->progressiveScanWrite = progressive; +} + +/*! + \since 5.5 + + Returns whether the image should be written as a progressive image. + + \sa setProgressiveScanWrite() +*/ +bool QImageWriter::progressiveScanWrite() const +{ + return d->progressiveScanWrite; +} + +/*! \obsolete Use setText() instead. @@ -657,6 +718,10 @@ bool QImageWriter::write(const QImage &image) d->handler->setOption(QImageIOHandler::Description, d->description); if (!d->subType.isEmpty() && d->handler->supportsOption(QImageIOHandler::SubType)) d->handler->setOption(QImageIOHandler::SubType, d->subType); + if (d->handler->supportsOption(QImageIOHandler::OptimizedWrite)) + d->handler->setOption(QImageIOHandler::OptimizedWrite, d->optimizedWrite); + if (d->handler->supportsOption(QImageIOHandler::ProgressiveScanWrite)) + d->handler->setOption(QImageIOHandler::ProgressiveScanWrite, d->progressiveScanWrite); if (!d->handler->write(image)) return false; |