diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 19:51:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 19:51:55 (GMT) |
| commit | 965516d4ed2f600b28ee730d4dfbdc083ecdbac4 (patch) | |
| tree | c2e8c4972bdf3596730a79319844050cdf32fd7b /src/gui/image/qimage.cpp | |
| parent | 1dfe43a858b4b5a60004160086e7486d8f80e064 (diff) | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| download | Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.zip Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.tar.gz Qt-965516d4ed2f600b28ee730d4dfbdc083ecdbac4.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/image/qimage.cpp')
| -rw-r--r-- | src/gui/image/qimage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 300e04b..5829fe8 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -6689,6 +6689,10 @@ bool QImageData::convertInPlace(QImage::Format newFormat, Qt::ImageConversionFla if (format == newFormat) return true; + // No in-place conversion if we have to detach + if (ref > 1) + return false; + const InPlace_Image_Converter *const converterPtr = &inplace_converter_map[format][newFormat]; InPlace_Image_Converter converter = *converterPtr; if (converter) |