diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
| commit | c04fd421375562f2db8ab89d7bb9509d9b655dd2 (patch) | |
| tree | 411853760626883241748157b8e3dca1b272722f /src/gui/painting/qdrawhelper.cpp | |
| parent | 441aff9d01a1530d2b187098c7c47bc683116a66 (diff) | |
| parent | 3fb70a8beea1dda58e50831edc5dd9073b899f72 (diff) | |
| download | Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.zip Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.gz Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 194dda3..660a2a8 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -2408,7 +2408,11 @@ static inline int soft_light_op(int dst, int src, int da, int sa) else if (4 * dst <= da) return (dst * sa * 255 + da * (src2 - sa) * ((((16 * dst_np - 12 * 255) * dst_np + 3 * 65025) * dst_np) / 65025) + temp) / 65025; else { +# ifdef Q_CC_RVCT // needed to avoid compiler crash in RVCT 2.2 + return (dst * sa * 255 + da * (src2 - sa) * (qIntSqrtInt(dst_np * 255) - dst_np) + temp) / 65025; +# else return (dst * sa * 255 + da * (src2 - sa) * (int(sqrt(qreal(dst_np * 255))) - dst_np) + temp) / 65025; +# endif } } |