diff options
| author | axis <qt-info@nokia.com> | 2009-05-11 06:30:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-11 06:30:34 (GMT) |
| commit | 804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867 (patch) | |
| tree | 0258fb5f685ccaa710f8ea8ec9da9b6aa9f91d35 /src/gui/painting/qdrawhelper.cpp | |
| parent | efb3e7288eec748db11c35de87239a1eff4d457c (diff) | |
| parent | 842ba1b3878c2973b24936b18a7ee55bdd980be6 (diff) | |
| download | Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.zip Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.gz Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 36e4300..ed4dd57 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -2527,8 +2527,7 @@ static inline int color_burn_op(int dst, int src, int da, int sa) if (src == 0 || src_da + dst_sa <= sa_da) return qt_div_255(temp); - else - return qt_div_255(sa * (src_da + dst_sa - sa_da) / src + temp); + return qt_div_255(sa * (src_da + dst_sa - sa_da) / src + temp); } template <typename T> |