diff options
| author | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
| commit | 2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch) | |
| tree | c274575bb148c9755a901094fc94d4553a84653c /src/plugins/imageformats/ico/qicohandler.cpp | |
| parent | ab8508380d6e5875ed871196eb09642380ac1aef (diff) | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| download | Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'src/plugins/imageformats/ico/qicohandler.cpp')
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index e01b33a..4d819d1 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -379,7 +379,7 @@ void ICOReader::findColorInfo(QImage & image) void ICOReader::readColorTable(QImage & image) { if (iod) { - image.setNumColors(icoAttrib.ncolors); + image.setColorCount(icoAttrib.ncolors); uchar rgb[4]; for (int i=0; i<icoAttrib.ncolors; i++) { if (iod->read((char*)rgb, 4) != 4) { @@ -574,7 +574,7 @@ QImage ICOReader::iconAt(int index) if (!image.isNull()) { QImage mask(image.width(), image.height(), QImage::Format_Mono); if (!mask.isNull()) { - mask.setNumColors(2); + mask.setColorCount(2); mask.setColor(0, qRgba(255,255,255,0xff)); mask.setColor(1, qRgba(0 ,0 ,0 ,0xff)); read1BitBMP(mask); |