pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-x64-mmx-emulation.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 83d607cbf1d3852f91b52a427bee30fffc3029e7
Author: Makoto Kato <m_kato at ga2.so-net.ne.jp>
Date:   Fri Aug 28 04:09:15 2009 -0400

    Remove spurious spaces in pixman-x64-mmx-emulation.h

diff --git a/pixman/pixman-x64-mmx-emulation.h b/pixman/pixman-x64-mmx-emulation.h
index 231030f..378019c 100644
--- a/pixman/pixman-x64-mmx-emulation.h
+++ b/pixman/pixman-x64-mmx-emulation.h
@@ -135,8 +135,8 @@ _m_paddusb (__m64 a, __m64 b)        /* unoptimized */
     unsigned long long y = ((M64U (a) >> 8) & 0x00FF00FF00FF00FFULL) +
                            ((M64U (b) >> 8) & 0x00FF00FF00FF00FFULL);
 
-    x | = ((x & 0xFF00FF00FF00FF00ULL) >> 8) * 0xFF;
-    y | = ((y & 0xFF00FF00FF00FF00ULL) >> 8) * 0xFF;
+    x |= ((x & 0xFF00FF00FF00FF00ULL) >> 8) * 0xFF;
+    y |= ((y & 0xFF00FF00FF00FF00ULL) >> 8) * 0xFF;
 
     x = (x & 0x00FF00FF00FF00FFULL) | ((y & 0x00FF00FF00FF00FFULL) << 8);
 
@@ -152,8 +152,8 @@ _m_paddusw (__m64 a, __m64 b)        /* unoptimized */
     unsigned long long y = ((M64U (a) >> 16) & 0x0000FFFF0000FFFFULL) +
                            ((M64U (b) >> 16) & 0x0000FFFF0000FFFFULL);
 
-    x | = ((x & 0xFFFF0000FFFF0000) >> 16) * 0xFFFF;
-    y | = ((y & 0xFFFF0000FFFF0000) >> 16) * 0xFFFF;
+    x |= ((x & 0xFFFF0000FFFF0000) >> 16) * 0xFFFF;
+    y |= ((y & 0xFFFF0000FFFF0000) >> 16) * 0xFFFF;
 
     x = (x & 0x0000FFFF0000FFFFULL) | ((y & 0x0000FFFF0000FFFFULL) << 16);