From c695543f76715f1f7acef32102c325399d0953cf Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 13 Jan 2014 12:43:48 +0100 Subject: Ref qualified version of QImage::convertToFormat Add ref qualified versions of QImage::convertToFormat, so that a temporary QImage can be converted in-place to a format of equal depth. [ChangeLog][QtGui][QImage]Added rvalue qualified convertToFormat method for in-place conversion Change-Id: I2eed5ffd63f5aea4ffa1147bf7607b02a49d9c5d Reviewed-by: Gunnar Sletta --- src/gui/image/qimage.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/gui/image/qimage.cpp') diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index d6037fb2d6..305595b68e 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1862,6 +1862,8 @@ QImage::Format QImage::format() const } /*! + \fn QImage QImage::convertToFormat(Format format, Qt::ImageConversionFlags flags) const + Returns a copy of the image in the given \a format. The specified image conversion \a flags control how the image data @@ -1869,7 +1871,11 @@ QImage::Format QImage::format() const \sa {Image Formats} */ -QImage QImage::convertToFormat(Format format, Qt::ImageConversionFlags flags) const + +/*! + \internal +*/ +QImage QImage::convertToFormat_helper(Format format, Qt::ImageConversionFlags flags) const { if (!d || d->format == format) return *this; @@ -1902,6 +1908,14 @@ QImage QImage::convertToFormat(Format format, Qt::ImageConversionFlags flags) co return convertToFormat(Format_ARGB32, flags).convertToFormat(format, flags); } +/*! + \internal +*/ +bool QImage::convertToFormat_inplace(Format format, Qt::ImageConversionFlags flags) +{ + return d && d->convertInPlace(format, flags); +} + static inline int pixel_distance(QRgb p1, QRgb p2) { int r1 = qRed(p1); int g1 = qGreen(p1); -- cgit v1.2.3