diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
| commit | 41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch) | |
| tree | 609e40eda10418bbf925002c36552074796b96b6 /src/gui/image/qpixmap_raster.cpp | |
| parent | d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff) | |
| download | Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2 | |
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
Diffstat (limited to 'src/gui/image/qpixmap_raster.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_raster.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 9cc896b..e0d952a 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -172,9 +172,13 @@ void QRasterPixmapData::fromImage(const QImage &sourceImage, } } #endif - w = image.d->width; - h = image.d->height; - d = image.d->depth; + if (image.d) { + w = image.d->width; + h = image.d->height; + d = image.d->depth; + } else { + w = h = d = 0; + } is_null = (w <= 0 || h <= 0); setSerialNumber(image.serialNumber()); |