[cairo-commit] cairo/pixman/src icimage.c,1.35,1.36

Anders Carlsson commit at pdx.freedesktop.org
Mon Jan 9 10:29:26 PST 2006


Committed by: andersca

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv28916/src

Modified Files:
	icimage.c 
Log Message:
2006-01-09  Anders Carlsson  <andersca at imendio.com>

        * src/icimage.c:
        (premultiply):
        (INTERPOLATE_PIXEL_256):
        Use uint32_t instead of uint;



Index: icimage.c
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/icimage.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- icimage.c	5 Jan 2006 00:39:23 -0000	1.35
+++ icimage.c	9 Jan 2006 18:29:24 -0000	1.36
@@ -110,10 +110,10 @@
         (c.blue >> 8);
 }
 
-static uint premultiply(uint x)
+static uint32_t premultiply(uint32_t x)
 {
-    uint a = x >> 24;
-    uint t = (x & 0xff00ff) * a + 0x800080;
+    uint32_t a = x >> 24;
+    uint32_t t = (x & 0xff00ff) * a + 0x800080;
     t = (t + ((t >> 8) & 0xff00ff)) >> 8;
     t &= 0xff00ff;
 
@@ -124,7 +124,7 @@
     return x;
 }
 
-static uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b)
+static uint32_t INTERPOLATE_PIXEL_256(uint32_t x, uint32_t a, uint32_t y, uint32_t b)
 {
     CARD32 t = (x & 0xff00ff) * a + (y & 0xff00ff) * b;
     t >>= 8;



More information about the cairo-commit mailing list