diff options
| author | Behdad Esfahbod <behdad@home.(none)> | 2006-03-15 10:07:58 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@home.(none)> | 2006-03-15 10:07:58 -0500 |
| commit | 6da5947efa6fbd0da85352974c2eb762bd42ffa7 (patch) | |
| tree | 55c4086e738912972af8d1cfa1aa1271bea646c7 | |
| parent | a5d13b472936b040755dd30624528cb7c6f52c73 (diff) | |
Bug #4260, Reviewed by B. Biggs
Use & not && for bitwise AND.
src/fbpict.c src/fbmmx.c: Take 'dest' as an argument, if pict and dest don't match for RGB, BGR, swap result.
(cherry picked from a1bca924b9296d769d735d8abaf1353143770def commit)
| -rw-r--r-- | pixman/ChangeLog | 11 | ||||
| -rw-r--r-- | pixman/src/fbpict.c | 2 | ||||
| -rw-r--r-- | pixman/src/fbpict.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/pixman/ChangeLog b/pixman/ChangeLog index d1d915f7f..c6e732840 100644 --- a/pixman/ChangeLog +++ b/pixman/ChangeLog @@ -33,6 +33,17 @@ 2005-08-28 Owen Taylor <otaylor@redhat.com> + Bug #4260, Reviewed by B. Biggs + + * src/fbcompose.c (fbStore_a8b8g8r8, fbStore_x8b8g8r8): Use & not + && for bitwise AND. + + * src/fbpict.h (fbComposeGetSolid) src/fbpict.c src/fbmmx.c: Take + 'dest' as an argument, if pict and dest don't match for RGB, BGR, + swap result. + +2005-08-28 Owen Taylor <otaylor@redhat.com> + * src/fbmmx.c (detectCPUFeatures): Use local labels rather than global labels in the assembly, to be robust if the code is inlined in multiple places. (#4283, Reported by Marco Manfredini) diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c index b69e79a86..09045ebe3 100644 --- a/pixman/src/fbpict.c +++ b/pixman/src/fbpict.c @@ -1,5 +1,5 @@ /* - * $Id: fbpict.c,v 1.5.2.2 2005-09-19 02:55:54 vektor Exp $ + * $Id: fbpict.c,v 1.6 2005-09-12 12:55:11 otaylor Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/pixman/src/fbpict.h b/pixman/src/fbpict.h index a6d2c15a8..95742ed8b 100644 --- a/pixman/src/fbpict.h +++ b/pixman/src/fbpict.h @@ -1,5 +1,5 @@ /* - * $Id: fbpict.h,v 1.1.4.1 2005-09-16 13:43:41 otaylor Exp $ + * $Id: fbpict.h,v 1.2 2005-09-12 12:55:11 otaylor Exp $ * * Copyright © 2000 Keith Packard * 2005 Lars Knoll & Zack Rusin, Trolltech |