summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_s60.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image/qpixmap_s60.cpp')
-rw-r--r--src/gui/image/qpixmap_s60.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 58b3ee4..ab19924 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -202,10 +202,13 @@ return a null QPixmap.
QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap)
{
+ if (!bitmap)
+ return QPixmap();
+
int width = bitmap->SizeInPixels().iWidth;
int height = bitmap->SizeInPixels().iHeight;
- if (!bitmap || width <= 0 || height <= 0 || bitmap->IsCompressedInRAM())
+ if (width <= 0 || height <= 0 || bitmap->IsCompressedInRAM())
return QPixmap();
TDisplayMode displayMode = bitmap->DisplayMode();