diff options
| author | aavit <qt-info@nokia.com> | 2011-06-27 13:43:22 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-06-27 13:43:22 (GMT) |
| commit | 4e25c4e1e2f648bcda55b2dca0857ff3e73245bf (patch) | |
| tree | a6a5e21ac53271215d015480204849590e044ecc /src/openvg/qpixmapdata_vg.cpp | |
| parent | 514941c71b69ab967bdd18ae758f953de05f5480 (diff) | |
| parent | c7fbfa24ede337a7e38d4436a927368d8d461621 (diff) | |
| download | Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.zip Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.tar.gz Qt-4e25c4e1e2f648bcda55b2dca0857ff3e73245bf.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
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 f3ca57c..597f3fa 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -249,9 +249,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; } |