From 1a63409579ff0e9ce524c09701c1ef8bd2d99f25 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 5 Jun 2020 16:09:43 +0200 Subject: QImageIO: use the new allocation checker in the format handlers Change-Id: I604d99ce476d4758a1e20b78257082911f1f1546 Task-number: QTBUG-85037 Reviewed-by: Lars Knoll --- src/plugins/imageformats/ico/qicohandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/imageformats/ico/qicohandler.cpp') 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); -- cgit v1.2.3