diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 16:34:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 16:34:09 (GMT) |
| commit | 0ee7b05373d6d7097f3f8c9479c80f936921625e (patch) | |
| tree | 2b343e12797a7114c690e8b0802c2d9f4e660649 | |
| parent | fc335fa5e2011df51fc3f4d33f0358dbf2786371 (diff) | |
| parent | be0b2f1eb209c0177500db3bf28bed3631523464 (diff) | |
| download | Qt-0ee7b05373d6d7097f3f8c9479c80f936921625e.zip Qt-0ee7b05373d6d7097f3f8c9479c80f936921625e.tar.gz Qt-0ee7b05373d6d7097f3f8c9479c80f936921625e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed cleartype text rendering on translucent surfaces.
| -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 070491d..2724d7f 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7174,9 +7174,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); |