From: Ivailo Monev Date: Sun, 27 Feb 2022 18:53:57 +0000 (+0200) Subject: QImageIOHandler::Quality is documented as image writing only property X-Git-Tag: 4.12.0~838 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2946d0ea2792c453f1c9e048c58ab68b33f228bb;p=kde%2FKatie.git QImageIOHandler::Quality is documented as image writing only property Signed-off-by: Ivailo Monev --- diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 99ebf000c..51aeaa171 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -506,45 +506,6 @@ QString QImageReader::fileName() const } /*! - \since 4.2 - - This is an image format specific function that sets the quality - level of the image to \a quality. For image formats that do not - support setting the quality, this value is ignored. - - The value range of \a quality should be between 0 and 100. - - \sa quality() -*/ -void QImageReader::setQuality(int quality) -{ - if (!d->initHandler()) - return; - if (Q_UNLIKELY(quality < 0 || quality > 100)) { - qWarning("QImageReader::setQuality: invalid quality value %d", quality); - quality = 100; - } - if (d->handler->supportsOption(QImageIOHandler::Quality)) - d->handler->setOption(QImageIOHandler::Quality, quality); -} - -/*! - \since 4.2 - - Returns the quality level of the image. Default value is 100. - - \sa setQuality() -*/ -int QImageReader::quality() const -{ - if (!d->initHandler()) - return 100; - if (d->handler->supportsOption(QImageIOHandler::Quality)) - return d->handler->option(QImageIOHandler::Quality).toInt(); - return 100; -} - -/*! Returns the size of the image, without actually reading the image contents. diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h index 9f80c15f6..63eda248d 100644 --- a/src/gui/image/qimagereader.h +++ b/src/gui/image/qimagereader.h @@ -69,9 +69,6 @@ public: void setScaledSize(const QSize &size); QSize scaledSize() const; - void setQuality(int quality); - int quality() const; - void setBackgroundColor(const QColor &color); QColor backgroundColor() const; diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index 8dafb343d..800ec5870 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -317,7 +317,12 @@ QString QImageWriter::fileName() const */ void QImageWriter::setQuality(int quality) { - d->quality = quality; + if (Q_UNLIKELY(quality < 0 || quality > 100)) { + qWarning("QImageWriter::setQuality: invalid quality value %d", quality); + quality = 100; + } else { + d->quality = quality; + } } /*!