diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/imageformats/gif/qgifhandler.cpp | 12 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 5 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/qjpeghandler.cpp | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index 078d3d596d..e895e4f91b 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -358,7 +358,10 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, state = Error; return -1; } - (*image) = QImage(swidth, sheight, format); + if (!QImageIOHandler::allocateImage(QSize(swidth, sheight), format, image)) { + state = Error; + return -1; + } bpl = image->bytesPerLine(); bits = image->bits(); if (bits) @@ -425,10 +428,9 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, return -1; } // We just use the backing store as a byte array - backingstore = QImage(qMax(backingstore.width(), w), - qMax(backingstore.height(), h), - QImage::Format_RGB32); - if (backingstore.isNull()) { + QSize bsSize(qMax(backingstore.width(), w), qMax(backingstore.height(), h)); + if (!QImageIOHandler::allocateImage(bsSize, QImage::Format_RGB32, + &backingstore)) { state = Error; return -1; } diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index d7b2fc64c2..631d7e8d0f 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -521,8 +521,9 @@ QImage ICOReader::iconAt(int index) else if (icoAttrib.ncolors > 0) format = QImage::Format_Indexed8; - QImage image(icoAttrib.w, icoAttrib.h, format); - if (!image.isNull()) { + QImage image; + const QSize size(icoAttrib.w, icoAttrib.h); + if (QImageIOHandler::allocateImage(size, format, &image)) { findColorInfo(image); if (!image.isNull()) { readBMP(image); diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index 25b0c625fd..1b48e8fc90 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -240,10 +240,7 @@ static bool ensureValidImage(QImage *dest, struct jpeg_decompress_struct *info, return false; // unsupported format } - if (dest->size() != size || dest->format() != format) - *dest = QImage(size, format); - - return !dest->isNull(); + return QImageIOHandler::allocateImage(size, format, dest); } static bool read_jpeg_image(QImage *outImage, |