diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
| commit | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /src/gui/painting/qdrawhelper.cpp | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 83e321747920c31d6fa4c860de3683630fbedb5d (diff) | |
| download | Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.zip Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.gz Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index e5b3ac0..71e2e3b 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7175,9 +7175,9 @@ static inline void rgbBlendPixel(quint32 *dst, int coverage, int sr, int sg, int ) { int a = qGray(coverage); - sr = qt_div_255(sr * a); - sg = qt_div_255(sg * a); - sb = qt_div_255(sb * a); + sr = qt_div_255(qt_pow_rgb_invgamma[sr] * a); + sg = qt_div_255(qt_pow_rgb_invgamma[sg] * a); + sb = qt_div_255(qt_pow_rgb_invgamma[sb] * a); int ia = 255 - a; dr = qt_div_255(dr * ia); |