diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-15 15:27:55 (GMT) |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-16 08:15:03 (GMT) |
| commit | 6afe7a233e66f0cae803590d536b4d379b7c1625 (patch) | |
| tree | 9885124e37367b7fb2ec967db3c4c4fbdfdcab07 /src/openvg/qpixmapdata_vg.cpp | |
| parent | 5e35452ad8420886f54df89d19205acb88ebb363 (diff) | |
| download | Qt-6afe7a233e66f0cae803590d536b4d379b7c1625.zip Qt-6afe7a233e66f0cae803590d536b4d379b7c1625.tar.gz Qt-6afe7a233e66f0cae803590d536b4d379b7c1625.tar.bz2 | |
Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
When drawing such pixmaps (used by both the openvg and opengl graphics
systems) onto another pixmap or to a QImage, the performance was
sub-optimal due to missing and accidentally disabled support
specific to QVolatileImage. This is now fixed and drawing pixmaps into
a QImage is also made optimal by using the QS60PaintEngine for
QImage too. This will cause a 5-7x (or even up to 12x on certain
hardware and platform) increase in offscreen pixmap drawing
performance.
Task-number: QTBUG-19880
Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src/openvg/qpixmapdata_vg.cpp')
| -rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index a5d156d..1231abf 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -248,9 +248,10 @@ void QVGPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags // same. Detaching is needed to prevent issues with painting // onto this QPixmap later on. convertedImage.detach(); + if (convertedImage.isNull()) + qWarning("QVGPixmapData: Failed to convert image data (out of memory? try increasing heap size)"); source = QVolatileImage(convertedImage); } - recreate = true; } |