Added default argument for color profile to QImage constructors.

Added default argument for color profile to QImage constructor
initializing QImages from pixel maps. This is to be used in future Qt
versions where color profile support will be added.

Change-Id: I815c3db4ef52f8383b48dad844b5f188aa3a3eee
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 71ec636..2c74804 100644 (file)
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -737,9 +737,10 @@ QImage::QImage()
     fill() to fill the image with an appropriate pixel value before
     drawing onto it with QPainter.
 */
-QImage::QImage(int width, int height, Format format)
+QImage::QImage(int width, int height, Format format, QColorProfile *profile)
     : QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(QSize(width, height), format, 0);
 }
 
@@ -752,9 +753,10 @@ QImage::QImage(int width, int height, Format format)
     fill() to fill the image with an appropriate pixel value before
     drawing onto it with QPainter.
 */
-QImage::QImage(const QSize &size, Format format)
+QImage::QImage(const QSize &size, Format format, QColorProfile *profile)
     : QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(size, format, 0);
 }
 
@@ -820,9 +822,10 @@ QImageData *QImageData::create(uchar *data, int width, int height,  int bpl, QIm
     initially empty and must be sufficiently expanded with
     setColorCount() or setColorTable() before the image is used.
 */
-QImage::QImage(uchar* data, int width, int height, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+QImage::QImage(uchar* data, int width, int height, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo, QColorProfile *profile)
     : QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(data, width, height, 0, format, false, cleanupFunction, cleanupInfo);
 }
 
@@ -851,9 +854,10 @@ QImage::QImage(uchar* data, int width, int height, Format format, QImageCleanupF
     constructing a QImage from raw data, without the possibility of the raw
     data being changed.
 */
-QImage::QImage(const uchar* data, int width, int height, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+QImage::QImage(const uchar* data, int width, int height, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo, QColorProfile *profile)
     : QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(const_cast<uchar*>(data), width, height, 0, format, true, cleanupFunction, cleanupInfo);
 }
 
@@ -874,9 +878,10 @@ QImage::QImage(const uchar* data, int width, int height, Format format, QImageCl
     initially empty and must be sufficiently expanded with
     setColorCount() or setColorTable() before the image is used.
 */
-QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo, QColorProfile *profile)
     :QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(data, width, height, bytesPerLine, format, false, cleanupFunction, cleanupInfo);
 }
 
@@ -906,9 +911,10 @@ QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format form
     data being changed.
 */
 
-QImage::QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+QImage::QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo, QColorProfile *profile)
     :QPaintDevice()
 {
+    Q_UNUSED(profile);
     d = QImageData::create(const_cast<uchar*>(data), width, height, bytesPerLine, format, true, cleanupFunction, cleanupInfo);
 }
 

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index eafd7eb..60aebac 100644 (file)
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -63,6 +63,8 @@ class QStringList;
 class QMatrix;
 class QTransform;
 class QVariant;
+class QColorProfile;
+
 template <class T> class QList;
 template <class T> class QVector;
 
@@ -128,12 +130,12 @@ public:
     };
 
     QImage();
-    QImage(const QSize &size, Format format);
-    QImage(int width, int height, Format format);
-    QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
-    QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
-    QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
-    QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0);
+    QImage(const QSize &size, Format format, QColorProfile *profile = 0);
+    QImage(int width, int height, Format format, QColorProfile *profile = 0);
+    QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0);
+    QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0);
+    QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0);
+    QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = 0, void *cleanupInfo = 0, QColorProfile *profile = 0);
 
 #ifndef QT_NO_IMAGEFORMAT_XPM
     explicit QImage(const char * const xpm[]);