pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/combine.h.inc |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit d68ebb7701e61d7f19c87d2d3686eb30e85e2ede
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Wed Oct 15 18:46:38 2008 -0400

    Remove unused AddMul_256 macro

diff --git a/pixman/combine.h.inc b/pixman/combine.h.inc
index 4261e83..6ecd301 100644
--- a/pixman/combine.h.inc
+++ b/pixman/combine.h.inc
@@ -119,20 +119,6 @@
     } while (0)
 
 /*
-  x_c = (x_c * a + y_c *b) / 256
-*/
-#define FbByteAddMul_256(x, a, y, b) do {                               \
-        comp4_t t = (x & RB_MASK) * a + (y & RB_MASK) * b;              \
-        t >>= G_SHIFT;                                                  \
-        t &= RB_MASK;                                                   \
-                                                                        \
-        x = ((x >> G_SHIFT) & RB_MASK) * a +                            \
-            ((y >> G_SHIFT) & RB_MASK) * b;                             \
-        x &= AG_MASK;                                                   \
-        x += t;                                                         \
-    } while (0)
-
-/*
   x_c = (x_c * a_c) / 255
 */
 #define FbByteMulC(x, a) do {                                           \