diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 19:08:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 19:08:07 +0000 |
| commit | 199039111284ed3a10508e2dc0db49ca4192389c (patch) | |
| tree | 1aa6deae00e08c734015dd8a494ed0f2a3e8d3dd /pixman/pixman/pixman-combine.c.template | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-199039111284ed3a10508e2dc0db49ca4192389c.tar.gz vcxsrv-199039111284ed3a10508e2dc0db49ca4192389c.tar.bz2 vcxsrv-199039111284ed3a10508e2dc0db49ca4192389c.zip | |
Switched to pixman-0.16.0.tar.gz
Diffstat (limited to 'pixman/pixman/pixman-combine.c.template')
| -rw-r--r-- | pixman/pixman/pixman-combine.c.template | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pixman/pixman/pixman-combine.c.template b/pixman/pixman/pixman-combine.c.template index 4a0e2bd06..c129980a8 100644 --- a/pixman/pixman/pixman-combine.c.template +++ b/pixman/pixman/pixman-combine.c.template @@ -78,7 +78,6 @@ combine_mask_alpha_ca (const comp4_t *src, comp4_t *mask) if (a == ~0) { - x = x >> A_SHIFT; x |= x << G_SHIFT; x |= x << R_SHIFT; *(mask) = x; @@ -1610,17 +1609,14 @@ combine_over_ca (pixman_implementation_t *imp, combine_mask_ca (&s, &m); a = ~m; - if (a != ~0) + if (a) { - if (a) - { - comp4_t d = *(dest + i); - UNcx4_MUL_UNcx4_ADD_UNcx4 (d, a, s); - s = d; - } - - *(dest + i) = s; + comp4_t d = *(dest + i); + UNcx4_MUL_UNcx4_ADD_UNcx4 (d, a, s); + s = d; } + + *(dest + i) = s; } } @@ -1644,10 +1640,8 @@ combine_over_reverse_ca (pixman_implementation_t *imp, comp4_t s = *(src + i); comp4_t m = *(mask + i); - combine_mask_value_ca (&s, &m); - - if (a != MASK) - UNcx4_MUL_UNc_ADD_UNcx4 (s, a, d); + UNcx4_MUL_UNcx4 (s, m); + UNcx4_MUL_UNc_ADD_UNcx4 (s, a, d); *(dest + i) = s; } |