1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement the QImageIOHandler::ImageFormat option for ico files.

Browse Source 
We need a method to check image format of .ico with QImageReader loader.
That is very useful to filter out low resolution icons.

Change-Id: I2dfe3aa49cbc1e05836be846ae3da30786b98ff4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Serge Lysenko 2015-09-14 13:17:05 +03:00
parent a6e2213e00
commit a4897c224a
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/imageformats/ico/qicohandler.cpp
View File

@ -779,11 +779,29 @@ QtIcoHandler::~QtIcoHandler()
QVariant QtIcoHandler::option(ImageOption option) const QVariant QtIcoHandler::option(ImageOption option) const
{ {
if (option == Size) { if (option == Size || option == ImageFormat) {
ICONDIRENTRY iconEntry; ICONDIRENTRY iconEntry;
if (m_pICOReader->readIconEntry(m_currentIconIndex, &iconEntry)) { if (m_pICOReader->readIconEntry(m_currentIconIndex, &iconEntry)) {
switch (option) {
case Size:
return QSize(iconEntry.bWidth ? iconEntry.bWidth : 256, return QSize(iconEntry.bWidth ? iconEntry.bWidth : 256,
iconEntry.bHeight ? iconEntry.bHeight : 256); iconEntry.bHeight ? iconEntry.bHeight : 256);
case ImageFormat:
switch (iconEntry.wBitCount) {
case 2:
return QImage::Format_Mono;
case 24:
return QImage::Format_RGB32;
case 32:
return QImage::Format_ARGB32;
default:
return QImage::Format_Indexed8;
}
break;
default:
break;
}
} }
} }
return QVariant(); return QVariant();
@ -791,7 +809,7 @@ QVariant QtIcoHandler::option(ImageOption option) const
bool QtIcoHandler::supportsOption(ImageOption option) const bool QtIcoHandler::supportsOption(ImageOption option) const
{ {
return option == Size; return (option == Size || option == ImageFormat);
} }
/*! /*!