From 9a6d3a1dcf89fc04f71a9dfed1aeeda1e3fb83bc Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Fri, 2 May 2008 17:33:17 -0700 Subject: [PATCH] Fix wide alpha fetch macro. Signed-off-by: Soren Sandmann Pedersen --- pixman/combine.inc | 2 ++ pixman/pixman-access.c | 4 ++++ pixman/pixman-image.c | 4 +++- pixman/pixman-private.h | 5 ----- pixman/pixman-transformed.c | 5 +++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pixman/combine.inc b/pixman/combine.inc index c3a57eb..63a3fe1 100644 --- a/pixman/combine.inc +++ b/pixman/combine.inc @@ -6,6 +6,8 @@ #include "pixman-private.h" +#define Alpha(x) ((x) >> A_SHIFT) + /* * Helper macros. */ diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c index 4a11bc0..29b846c 100644 --- a/pixman/pixman-access.c +++ b/pixman/pixman-access.c @@ -31,6 +31,10 @@ #include "pixman-private.h" +#define Red(x) (((x) >> 16) & 0xff) +#define Green(x) (((x) >> 8) & 0xff) +#define Blue(x) ((x) & 0xff) + /* * YV12 setup and access macros */ diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c index 30c294b..f34053c 100644 --- a/pixman/pixman-image.c +++ b/pixman/pixman-image.c @@ -30,6 +30,8 @@ #include "pixman-private.h" +#define Alpha(x) ((x) >> 24) + static void init_source_image (source_image_t *image) { @@ -800,4 +802,4 @@ pixman_image_is_opaque(pixman_image_t *image) } return TRUE; -} \ No newline at end of file +} diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 8792027..4a6e045 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -419,11 +419,6 @@ union pixman_image WRITE(img, (a)+2, (uint8_t) ((v) >> 16)))) #endif -#define Alpha(x) ((x) >> 24) -#define Red(x) (((x) >> 16) & 0xff) -#define Green(x) (((x) >> 8) & 0xff) -#define Blue(x) ((x) & 0xff) - #define CvtR8G8B8toY15(s) (((((s) >> 16) & 0xff) * 153 + \ (((s) >> 8) & 0xff) * 301 + \ (((s) ) & 0xff) * 58) >> 2) diff --git a/pixman/pixman-transformed.c b/pixman/pixman-transformed.c index 3f176d6..569fcae 100644 --- a/pixman/pixman-transformed.c +++ b/pixman/pixman-transformed.c @@ -31,6 +31,11 @@ #include "pixman-private.h" +#define Alpha(x) ((x) >> 24) +#define Red(x) (((x) >> 16) & 0xff) +#define Green(x) (((x) >> 8) & 0xff) +#define Blue(x) ((x) & 0xff) + /* * Fetch from region strategies */ -- 2.7.4