diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
| commit | 0713442baa4120050e85c13998797415bb40efce (patch) | |
| tree | 2735cae5573363fd5edceae71ae8b7af60518df2 /src/gui/painting/qdrawhelper_sse2.cpp | |
| parent | 08478207ee9a6563ae63ebcef833925db6426bd8 (diff) | |
| parent | 01648005f1f546dc0281155fecd94b4f47a94584 (diff) | |
| download | Qt-0713442baa4120050e85c13998797415bb40efce.zip Qt-0713442baa4120050e85c13998797415bb40efce.tar.gz Qt-0713442baa4120050e85c13998797415bb40efce.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'src/gui/painting/qdrawhelper_sse2.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper_sse2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index 04fe825..6cd8688 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -299,7 +299,7 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl, void QT_FASTCALL comp_func_SourceOver_sse2(uint *destPixels, const uint *srcPixels, int length, uint const_alpha) { - Q_ASSERT(const_alpha > 0); // if const_alpha == 0, this should never be called + Q_ASSERT(const_alpha >= 0); Q_ASSERT(const_alpha < 256); const quint32 *src = (const quint32 *) srcPixels; |