diff options
| author | Jeff Muizelaar <jeff@infidigm.net> | 2005-08-05 12:26:33 +0000 |
|---|---|---|
| committer | Jeff Muizelaar <jeff@infidigm.net> | 2005-08-05 12:26:33 +0000 |
| commit | ec93e241b0cf161216dab27eeee3917a71230aa7 (patch) | |
| tree | ca41a064377e9d22ad60d9d7429b665e4c98c677 /pixman | |
| parent | 3ef2488265a1671d42224f4dca1b62c007ef5b0a (diff) | |
Fix fbGetDrawable
Patch from Billy Biggs <vektor@dumbterm.net>.
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/ChangeLog | 6 | ||||
| -rw-r--r-- | pixman/src/pixman-xserver-compat.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pixman/ChangeLog b/pixman/ChangeLog index 4cb1244e..ae22cd98 100644 --- a/pixman/ChangeLog +++ b/pixman/ChangeLog @@ -1,5 +1,11 @@ 2005-08-05 Jeff Muizelaar <jeff@infidigm.net> + * src/pixman-xserver-compat.h: Fix fbGetDrawable + + Patch from Billy Biggs <vektor@dumbterm.net>. + +2005-08-05 Jeff Muizelaar <jeff@infidigm.net> + * src/icint.h: Fix some of the 4 bit per channel PICT definitions Patch from Billy Biggs <vektor@dumbterm.net>. diff --git a/pixman/src/pixman-xserver-compat.h b/pixman/src/pixman-xserver-compat.h index 35238768..c92ba668 100644 --- a/pixman/src/pixman-xserver-compat.h +++ b/pixman/src/pixman-xserver-compat.h @@ -78,10 +78,10 @@ typedef pixman_triangle_t xTriangle; /* XXX: We changed some function and field names which makes for some * ugly hacks... */ #define pDrawable pixels -#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \ +#define fbGetDrawable(pDrawable, buf, outstride, outbpp, xoff, yoff) { \ (buf) = (pDrawable)->data; \ - (stride) = ((int) pDrawable->stride) / sizeof (pixman_bits_t); \ - (bpp) = (pDrawable)->bpp; \ + (outstride) = ((int) pDrawable->stride) / sizeof (pixman_bits_t); \ + (outbpp) = (pDrawable)->bpp; \ (xoff) = 0; \ (yoff) = 0; \ } |