diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-01-25 06:19:34 (GMT) |
| commit | 05c543c75043824e12dac17a55e89bc11e74c7a4 (patch) | |
| tree | 4b9b117084b21dc9a8486befefd2f60c138c1ea4 /src/gui/painting/qdrawhelper.cpp | |
| parent | 7bc18035816a2eac15dfac4d987eb9bf43f90ef6 (diff) | |
| parent | 6b79cbf5cadbaebef8be895a47ca314724afb1a1 (diff) | |
| download | Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.zip Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.gz Qt-05c543c75043824e12dac17a55e89bc11e74c7a4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 84cf5cc..194dda3 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1364,7 +1364,10 @@ static void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int le for (int i = 0; i < length; ++i) { PRELOAD_COND2(dest, src) uint s = src[i]; - dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s)); + if (s >= 0xff000000) + dest[i] = s; + else if (s != 0) + dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s)); } } else { for (int i = 0; i < length; ++i) { |