summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2006-03-13 13:20:29 -0800
committerCarl Worth <cworth@cworth.org>2006-03-13 13:20:47 -0800
commita5d13b472936b040755dd30624528cb7c6f52c73 (patch)
tree7486393e05337ed8e2c2e75061a5b8d0a9709116
parent440bb68ef207b9101f355b2d1ccbaa5d1b166c4a (diff)
downloadcairo-a5d13b472936b040755dd30624528cb7c6f52c73.tar.gz
fbCompositeTrans_0888xnx0888: Fix suspicious logical negation of pointer value.
Surely, the ! instead of ~ here was just a typo. I'd feel better if I had a failing test case for this though, (time to break out gcov again). Fixes bug #6185: Strange pointer operations in fbCompositeTrans_0888xnx0888 (pixman/src/fbpict.c) https://bugs.freedesktop.org/show_bug.cgi?id=6185 (cherry picked from 5d89faf6b37bb0367c8ba8f8637fc80bd745c888 commit)
-rw-r--r--pixman/src/fbpict.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index bcb6cc893..b69e79a86 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1151,7 +1151,7 @@ fbCompositeTrans_0888xnx0888(pixman_operator_t op,
setupPackedReader(ws,wt,isrc,wsrc,workingSource);
/* get to word aligned */
- switch(!(long)dst&3)
+ switch(~(long)dst&3)
{
case 1:
readPackedSource(rs);
@@ -1227,7 +1227,7 @@ fbCompositeTrans_0888xnx0888(pixman_operator_t op,
srcLine += srcStride;
w = width*3;
/* get to word aligned */
- switch(!(long)src&3)
+ switch(~(long)src&3)
{
case 1:
rd=alphamaskCombine24(*src++, *dst)>>8;