diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 14:09:06 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-03-15 14:09:06 (GMT) |
| commit | b36f947147e3f5acf444c94d6e2a608506b7e753 (patch) | |
| tree | a0bf253b8e315305cfada01871f3a1cbf54aef43 /src/gui/painting/qdrawhelper_arm_simd.cpp | |
| parent | d524e983c60ba59f3c65d811ec92f02c97d1a8ab (diff) | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| download | Qt-b36f947147e3f5acf444c94d6e2a608506b7e753.zip Qt-b36f947147e3f5acf444c94d6e2a608506b7e753.tar.gz Qt-b36f947147e3f5acf444c94d6e2a608506b7e753.tar.bz2 | |
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/painting/qdrawhelper_arm_simd.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper_arm_simd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_arm_simd.cpp b/src/gui/painting/qdrawhelper_arm_simd.cpp index 806df29..af9854c 100644 --- a/src/gui/painting/qdrawhelper_arm_simd.cpp +++ b/src/gui/painting/qdrawhelper_arm_simd.cpp @@ -201,8 +201,8 @@ argb32constalpha_next_pixel uxtb16 r10, r9 uxtb16 r6, r9, ror #8 - // Negate r11 and extract src alpha - mvn r9, r11 // bitwise not + // Negate r8 and extract src alpha + mvn r9, r8 // bitwise not uxtb r9, r9, ror #24 mla r10, r9, r10, r14 |