diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-05 13:07:05 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-06 13:07:37 (GMT) |
| commit | c51cb773acb1c2ba4a89dce07c55103f8c795bcf (patch) | |
| tree | 886a681bc567910a96e69e04f662aaa3dc0684b1 /src | |
| parent | e0679bf4aaf3e31d2d8f4dd596fcdd76b0a7ed69 (diff) | |
| download | Qt-c51cb773acb1c2ba4a89dce07c55103f8c795bcf.zip Qt-c51cb773acb1c2ba4a89dce07c55103f8c795bcf.tar.gz Qt-c51cb773acb1c2ba4a89dce07c55103f8c795bcf.tar.bz2 | |
Fixed crash in QPixmap::resize_helper on mac and x11
Reviewed-by: Trond
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index c452b9a..dfeea76 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -639,13 +639,13 @@ void QPixmap::resize_helper(const QSize &s) QPixmap pm(QSize(w, h), data ? data->type : QPixmapData::PixmapType); bool uninit = false; #if defined(Q_WS_X11) - QX11PixmapData *x11Data = data->classId() == QPixmapData::X11Class ? static_cast<QX11PixmapData*>(data.data()) : 0; + QX11PixmapData *x11Data = data && data->classId() == QPixmapData::X11Class ? static_cast<QX11PixmapData*>(data.data()) : 0; if (x11Data) { pm.x11SetScreen(x11Data->xinfo.screen()); uninit = x11Data->flags & QX11PixmapData::Uninitialized; } #elif defined(Q_WS_MAC) - QMacPixmapData *macData = data->classId() == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(data.data()) : 0; + QMacPixmapData *macData = data && data->classId() == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(data.data()) : 0; if (macData) uninit = macData->uninit; #endif |