diff options
author | Alexandros Dermenakis <alexandros.dermenakis@nokia.com> | 2012-07-23 16:27:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 15:37:46 +0200 |
commit | edc6fce47f5bbf0d0c85d2c87efa30d13e8fc903 (patch) | |
tree | 94290c90eaa01d0e2d03db6ffc6627b3ebc1ac5a /src/gui/image/qimage.h | |
parent | a70eb262c101ec7e278b883c98a5e7a5328dfdf4 (diff) |
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>
Diffstat (limited to 'src/gui/image/qimage.h')
-rw-r--r-- | src/gui/image/qimage.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index eafd7eb598..60aebacf13 100644 --- 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[]); |