From 47bf1147322ba30a1e13aa9bdbe0cf0fe36dc29d Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 9 Apr 2011 03:44:07 +0200 Subject: Slightly improve EXTRACT_ARGB32 macro (bzr r9508.1.79) --- src/display/cairo-utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index d5c84810c..1ad3c0b46 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -126,10 +126,10 @@ void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv); #define EXTRACT_ARGB32(px,a,r,g,b) \ guint32 a, r, g, b; \ - a = (px & 0xff000000) >> 24; \ - r = (px & 0x00ff0000) >> 16; \ - g = (px & 0x0000ff00) >> 8; \ - b = (px & 0x000000ff); + a = ((px) & 0xff000000) >> 24; \ + r = ((px) & 0x00ff0000) >> 16; \ + g = ((px) & 0x0000ff00) >> 8; \ + b = ((px) & 0x000000ff); #define ASSEMBLE_ARGB32(px,a,r,g,b) \ guint32 px = (a << 24) | (r << 16) | (g << 8) | b; -- cgit v1.2.3