diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 21:53:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 21:53:22 (GMT) |
| commit | f9ca0df998a8a3a942816f2954603ad996210d8d (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /src/gui/painting | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (diff) | |
| download | Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.zip Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.gz Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Use AudioConverter when not preferred format.
Handle values passed to setNotifyInterval more robustly.
Make sure to check for a valid audioformat before open.
Implement symbian^3 e32atomics API
Fix runonphone target due to changed name of sis files
Fix fromSymbian*() image conversion functions.
Fixed cleartype text rendering on translucent surfaces.
Make QColorDialog usable on small screens
Added exit softkey to Wiggly example
Diffstat (limited to 'src/gui/painting')
| -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); |