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 a1bca924b9 commit)
This commit is contained in:
Behdad Esfahbod 2006-03-15 10:07:58 -05:00
parent a5d13b4729
commit 6da5947efa
3 changed files with 13 additions and 2 deletions

View file

@ -31,6 +31,17 @@
'dest' as an argument, if pict and dest don't match for RGB, BGR,
swap result.
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

View file

@ -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.
*

View file

@ -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