summaryrefslogtreecommitdiffstats
path: root/src/openvg
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-22 16:05:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-22 16:05:56 (GMT)
commit30499d8e897472e42d97efd5014a2cc1f56cc725 (patch)
tree27459cb72b251a4727c1d0fbd50406fb43c71f6c /src/openvg
parent13d4be08d1d07434515855e7fde8c3ab589358c4 (diff)
parentbf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff)
downloadQt-30499d8e897472e42d97efd5014a2cc1f56cc725.zip
Qt-30499d8e897472e42d97efd5014a2cc1f56cc725.tar.gz
Qt-30499d8e897472e42d97efd5014a2cc1f56cc725.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/openvg')
-rw-r--r--src/openvg/qpaintengine_vg.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 3d50558..44dceea 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -3181,6 +3181,8 @@ void QVGPaintEngine::drawImage
Qt::ImageConversionFlags flags)
{
Q_D(QVGPaintEngine);
+ if (image.isNull())
+ return;
VGImage vgImg;
if (d->simpleTransform || d->opacity == 1.0f)
vgImg = toVGImageSubRect(image, sr.toRect(), flags);
@@ -3226,6 +3228,8 @@ void QVGPaintEngine::drawImage
void QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image)
{
Q_D(QVGPaintEngine);
+ if (image.isNull())
+ return;
VGImage vgImg;
if (canVgWritePixels(image)) {
// Optimization for straight blits, no blending