diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-02-02 11:46:53 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-02-02 11:46:53 (GMT) |
| commit | 56b910a838e93d849ec260f4c3db9a716beecdc0 (patch) | |
| tree | 50b9cb09e3ea7780e144bb02f42475dcf740f297 /src/plugins/imageformats/ico/qicohandler.cpp | |
| parent | 84f826b764acecc0a93fcfd643719f6447b5d47c (diff) | |
| parent | 7ced77b654eb46af1221a55e315795c1be1753a0 (diff) | |
| download | Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.zip Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.tar.gz Qt-56b910a838e93d849ec260f4c3db9a716beecdc0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/plugins/imageformats/ico/qicohandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 4f49476..b2351fa 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -556,7 +556,11 @@ QImage ICOReader::iconAt(int index) else // # colors used icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits; icoAttrib.w = iconEntry.bWidth; + if (icoAttrib.w == 0) + icoAttrib.w = header.biWidth; icoAttrib.h = iconEntry.bHeight; + if (icoAttrib.h == 0) + icoAttrib.h = header.biHeight/2; QImage::Format format = QImage::Format_ARGB32; if (icoAttrib.nbits == 24) |