diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 05:53:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 05:53:28 (GMT) |
| commit | 2fdac06f820f2362d3ca83ab6d73ed874d903098 (patch) | |
| tree | bf9b1ff80a6b85dcb6e3148afc4fd9506985c5c0 /src/gui/image/qimage_p.h | |
| parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
| parent | 0a96503e84b418708712af61497df4a493ed9072 (diff) | |
| download | Qt-2fdac06f820f2362d3ca83ab6d73ed874d903098.zip Qt-2fdac06f820f2362d3ca83ab6d73ed874d903098.tar.gz Qt-2fdac06f820f2362d3ca83ab6d73ed874d903098.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Start the implementation of in-place recoding for images
Fix a possible crash with the EVR video renderer in windows
Don't do opaque detection when copying a sub-rect of a QPixmap.
Optimized QPixmap::fromImage for raster pixmaps.
Doc: Small change to QAbstractItemDelegate::editorEvent()
Typo in qcleanlooksstyle.cpp
Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.
Speed up calls to QPainter::setCompositionMode when the mode is unchanged
Diffstat (limited to 'src/gui/image/qimage_p.h')
| -rw-r--r-- | src/gui/image/qimage_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 0c19647..f1a0c47 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -96,6 +96,9 @@ struct Q_GUI_EXPORT QImageData { // internal image data bool checkForAlphaPixels() const; + // Convert the image in-place, minimizing memory reallocation + // Return false if the conversion cannot be done in-place. + bool convertInPlace(QImage::Format newFormat, Qt::ImageConversionFlags); #ifndef QT_NO_IMAGE_TEXT QMap<QString, QString> text; |