remove the unused gamma option of QImageWriter

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 691d3ff..0d2c147 100644 (file)
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -75,10 +75,6 @@
     compression level depending on the value of this option (an int)
     when writing. The value is usually in the 0-9 range.
 
-    \value Gamma The gamma level of the image. A handler that supports
-    this option is expected to set the image gamma level depending on
-    the value of this option (a float) when writing.
-
     \value Quality The quality level of the image. A handler that
     supports this option is expected to set the image quality level
     depending on the value of this option (an int) when writing.

diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 2e107aa..008922b 100644 (file)
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -58,7 +58,6 @@ public:
         Size,
         ScaledSize,
         CompressionLevel,
-        Gamma,
         Quality,
         Animation,
         BackgroundColor

diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index f1f81e6..10bed32 100644 (file)
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -29,18 +29,17 @@
     \ingroup io
 
     QImageWriter supports setting format specific options, such as the
-    gamma level, compression level and quality, prior to storing the
-    image. If you do not need such options, you can use QImage::save()
-    or QPixmap::save() instead.
+    compression level and quality, prior to storing the image. If you
+    do not need such options, you can use QImage::save() or
+    QPixmap::save() instead.
 
     To store an image, you start by constructing a QImageWriter
     object.  Pass either a file name or a device pointer, and the
     image format to QImageWriter's constructor. You can then set
-    several options, such as the gamma level (by calling setGamma())
-    and quality (by calling setQuality()). canWrite() returns true if
-    QImageWriter can write the image (i.e., the image format is
-    supported and the device is open for writing). Call write() to
-    write the image to the device.
+    several options, such as the quality (by calling setQuality()).
+    canWrite() returns true if QImageWriter can write the image (i.e.,
+    the image format is supported and the device is open for writing).
+    Call write() to write the image to the device.
 
     If any error occurs when writing the image, write() will return
     false. You can then call error() to find the type of error that
@@ -146,7 +145,6 @@ public:
     // image options
     int quality;
     int compression;
-    float gamma;
 
     // error
     QImageWriter::ImageWriterError imageWriterError;
@@ -161,7 +159,6 @@ QImageWriterPrivate::QImageWriterPrivate()
     handler(nullptr),
     quality(-1),
     compression(1),
-    gamma(0.0),
     imageWriterError(QImageWriter::UnknownError)
 {
 }
@@ -363,31 +360,6 @@ int QImageWriter::compression() const
 }
 
 /*!
-    This is an image format specific function that sets the gamma
-    level of the image to \a gamma. For image formats that do not
-    support setting the gamma level, this value is ignored.
-
-    The value range of \a gamma depends on the image format. For
-    example, the "png" format supports a gamma range from 0.0 to 1.0.
-
-    \sa quality()
-*/
-void QImageWriter::setGamma(float gamma)
-{
-    d->gamma = gamma;
-}
-
-/*!
-    Returns the gamma level of the image.
-
-    \sa setGamma()
-*/
-float QImageWriter::gamma() const
-{
-    return d->gamma;
-}
-
-/*!
     Returns true if QImageWriter can write the image; i.e., the image
     format is supported and the assigned device is open for reading.
 
@@ -426,8 +398,6 @@ bool QImageWriter::write(const QImage &image)
         d->handler->setOption(QImageIOHandler::Quality, d->quality);
     if (d->handler->supportsOption(QImageIOHandler::CompressionLevel))
         d->handler->setOption(QImageIOHandler::CompressionLevel, d->compression);
-    if (d->handler->supportsOption(QImageIOHandler::Gamma))
-        d->handler->setOption(QImageIOHandler::Gamma, d->gamma);
 
     if (!d->handler->write(image))
         return false;

diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index 6fbfb8d..27d7af6 100644 (file)
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -62,9 +62,6 @@ public:
     void setCompression(int compression);
     int compression() const;
 
-    void setGamma(float gamma);
-    float gamma() const;
-
     bool canWrite() const;
     bool write(const QImage &image);