diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-09-03 07:52:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-09-03 07:52:57 (GMT) |
| commit | c1c04a016db5eefb3ee3dd26a20455aa14483713 (patch) | |
| tree | ef11e51dc1323451182cb35c9a047f3dfa1f6323 /src/gui/painting/qdrawhelper.cpp | |
| parent | 250545f7996927fa151097857179b5895010506b (diff) | |
| parent | 9311f0554b885f6b3ab1ab77f9c65b9f89865675 (diff) | |
| download | Qt-c1c04a016db5eefb3ee3dd26a20455aa14483713.zip Qt-c1c04a016db5eefb3ee3dd26a20455aa14483713.tar.gz Qt-c1c04a016db5eefb3ee3dd26a20455aa14483713.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 5223458..5e1509d 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -8014,6 +8014,7 @@ void qInitDrawhelperAsm() qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_neon; qBlendFunctions[QImage::Format_RGB16][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_rgb16_neon; qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB16] = qt_blend_rgb16_on_argb32_neon; + qBlendFunctions[QImage::Format_RGB16][QImage::Format_RGB16] = qt_blend_rgb16_on_rgb16_neon; qScaleFunctions[QImage::Format_RGB16][QImage::Format_ARGB32_Premultiplied] = qt_scale_image_argb32_on_rgb16_neon; qScaleFunctions[QImage::Format_RGB16][QImage::Format_RGB16] = qt_scale_image_rgb16_on_rgb16_neon; |