Remove optimizations that I'm not convinced are correct

diff --git a/pixman/pixman-combine.c.template b/pixman/pixman-combine.c.template
index cbbcde7..01bbc31 100644 (file)
--- a/pixman/pixman-combine.c.template
+++ b/pixman/pixman-combine.c.template
@@ -391,23 +391,15 @@ fbCombineMultiplyC (pixman_implementation_t *imp, pixman_op_t op,
     for (i = 0; i < width; ++i) {
         comp4_t m = *(mask + i);
         comp4_t s = combineMask (src, mask, i);
+       comp4_t d = *(dest + i);
+       comp4_t r = d;
+       comp4_t dest_ia = Alpha (~d);
 
        fbCombineMaskValueC (&s, &m);
 
-        if (m == 0)
-           continue;
-
-       m = ~m;
-       if (m != 0)
-       {
-           comp4_t d = *(dest + i);
-           comp4_t r = d;
-           comp4_t dest_ia = Alpha (~d);
-           
-           FbByteAddMulC (r, m, s, dest_ia);
-           FbByteMulC (d, s);
-           FbByteAdd (r, d);
-       }
+       FbByteAddMulC (r, ~m, s, dest_ia);
+       FbByteMulC (d, s);
+       FbByteAdd (r, d);
 
        *(dest + i) = r;
     }
@@ -454,9 +446,6 @@ fbCombine ## name ## C (pixman_implementation_t *imp, pixman_op_t op, \
                                                    \
        fbCombineMaskValueC (&s, &m);               \
                                                    \
-        if (m == 0)                                \
-           continue;                               \
-                                                   \
        result = d;                                 \
        FbByteAddMulC (result, ~m, s, ida);         \
                                                    \