diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 18:59:13 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 18:59:13 +1000 |
| commit | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (patch) | |
| tree | d9f93861d18e84dd4c5e50c3b3ced60a1f6e3528 /src/openvg | |
| parent | 011c6d0f7498bf390e8df1ae646cfb649d8e143f (diff) | |
| parent | dfa9643193134612f3e5d25c5fa4f2a9d1fd6837 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed drawImage() not to attempt drawing null images on openvg.
QS60Style: Update placeholder texture to real one
Diffstat (limited to 'src/openvg')
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 3d50558aab..44dceeaf68 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 |