summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-08-02 09:11:52 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-02 09:14:22 (GMT)
commitf127fadc833f7b64977877879787d96586d0a501 (patch)
treedb57d2c7f85cceaa7b7c486ddf5da18164c10286 /src/gui
parent79366cdeef2a378356e2d6fdbceb68c6419ec062 (diff)
downloadQt-f127fadc833f7b64977877879787d96586d0a501.zip
Qt-f127fadc833f7b64977877879787d96586d0a501.tar.gz
Qt-f127fadc833f7b64977877879787d96586d0a501.tar.bz2
Revert "Fix the byte order in QImage::fill for 24bpp formats"
This change the behavior. (as it break tests like drawImage_task258776 and tst_QPainter::drawhelper_blend_color) The bug it fixes is not considered importent enough This reverts commit 121c5143f1002734ff7aa62785ff14e0e6612aae and d8c6ae24f94133828f4f1b536538e69c5e438202
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 52ba2b9..30cf758 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2010,7 +2010,7 @@ void QImage::fill(uint pixel)
0, 0, d->width, d->height, d->bytes_per_line);
return;
} else if (d->depth == 24) {
- qt_rectfill<qrgb888>(reinterpret_cast<qrgb888*>(d->data), pixel,
+ qt_rectfill<quint24>(reinterpret_cast<quint24*>(d->data), pixel,
0, 0, d->width, d->height, d->bytes_per_line);
return;
}