[cairo-commit] libpixman/src iccompose.c, 1.19, 1.20 icimage.h, 1.23, 1.24

[Jeff Muizelaar]

Committed by: jrmuizel

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv22721/src

Modified Files:
	iccompose.c icimage.h 
Log Message:
2005-06-23  Jeff Muizelaar  <jeff at infidigm.net>

	* src/iccompose.c: (IcCombineMaskU), (IcCombineMaskC),
	(IcCombineMaskValueC), (IcCombineMaskAlphaU),
	(IcCombineMaskAlphaC), (IcCombineClear), (IcCombineSrcU),
	(IcCombineSrcC), (IcCombineDst), (IcCombineOverU),
	(IcCombineOverC), (IcCombineOverReverseU), (IcCombineOverReverseC),
	(IcCombineInU), (IcCombineInC), (IcCombineInReverseU),
	(IcCombineInReverseC), (IcCombineOutU), (IcCombineOutC),
	(IcCombineOutReverseU), (IcCombineOutReverseC), (IcCombineAtopU),
	(IcCombineAtopC), (IcCombineAtopReverseU), (IcCombineAtopReverseC),
	(IcCombineXorU), (IcCombineXorC), (IcCombineAddU), (IcCombineAddC),
	(IcCombineDisjointGeneralU), (IcCombineDisjointGeneralC),
	(IcCombineDisjointOverU), (IcCombineDisjointOverC),
	(IcCombineDisjointOverReverseU), (IcCombineDisjointOverReverseC),
	(IcCombineDisjointInU), (IcCombineDisjointInC),
	(IcCombineDisjointInReverseU), (IcCombineDisjointInReverseC),
	(IcCombineDisjointOutU), (IcCombineDisjointOutC),
	(IcCombineDisjointOutReverseU), (IcCombineDisjointOutReverseC),
	(IcCombineDisjointAtopU), (IcCombineDisjointAtopC),
	(IcCombineDisjointAtopReverseU), (IcCombineDisjointAtopReverseC),
	(IcCombineDisjointXorU), (IcCombineDisjointXorC),
	(IcCombineConjointGeneralU), (IcCombineConjointGeneralC),
	(IcCombineConjointOverU), (IcCombineConjointOverC),
	(IcCombineConjointOverReverseU), (IcCombineConjointOverReverseC),
	(IcCombineConjointInU), (IcCombineConjointInC),
	(IcCombineConjointInReverseU), (IcCombineConjointInReverseC),
	(IcCombineConjointOutU), (IcCombineConjointOutC),
	(IcCombineConjointOutReverseU), (IcCombineConjointOutReverseC),
	(IcCombineConjointAtopU), (IcCombineConjointAtopC),
	(IcCombineConjointAtopReverseU), (IcCombineConjointAtopReverseC),
	(IcCombineConjointXorU), (IcCombineConjointXorC),
	(IcFetch_a8r8g8b8), (IcFetch_x8r8g8b8), (IcFetch_a8b8g8r8),
	(IcFetch_x8b8g8r8), (IcFetch_r8g8b8), (IcFetch_b8g8r8),
	(IcFetch_r5g6b5), (IcFetch_b5g6r5), (IcFetch_a1r5g5b5),
	(IcFetch_x1r5g5b5), (IcFetch_a1b5g5r5), (IcFetch_x1b5g5r5),
	(IcFetch_a4r4g4b4), (IcFetch_x4r4g4b4), (IcFetch_a4b4g4r4),
	(IcFetch_x4b4g4r4), (IcFetch_a8), (IcFetcha_a8), (IcFetch_r3g3b2),
	(IcFetch_b2g3r3), (IcFetch_a2r2g2b2), (IcFetch_a4), (IcFetcha_a4),
	(IcFetch_r1g2b1), (IcFetch_b1g2r1), (IcFetch_a1r1g1b1),
	(IcFetch_a1b1g1r1), (IcFetcha_a1), (IcFetch_a1),
	(IcStore_a8r8g8b8), (IcStore_x8r8g8b8), (IcStore_a8b8g8r8),
	(IcStore_x8b8g8r8), (IcStore_r8g8b8), (IcStore_b8g8r8),
	(IcStore_r5g6b5), (IcStore_b5g6r5), (IcStore_a1r5g5b5),
	(IcStore_x1r5g5b5), (IcStore_a1b5g5r5), (IcStore_x1b5g5r5),
	(IcStore_a4r4g4b4), (IcStore_x4r4g4b4), (IcStore_a4b4g4r4),
	(IcStore_x4b4g4r4), (IcStore_a8), (IcStore_r3g3b2),
	(IcStore_b2g3r3), (IcStore_a2r2g2b2), (IcStore_a4),
	(IcStore_r1g2b1), (IcStore_b1g2r1), (IcStore_a1r1g1b1),
	(IcStore_a1b1g1r1), (IcStore_a1), (IcFetch_external),
	(IcFetcha_external), (IcStore_external), (IcFetch_transform),
	(IcFetcha_transform), (IcStepOver), (IcStepDown), (IcSet),
	(IcStepOver_external), (IcStepDown_external), (IcSet_external),
	(IcStepOver_transform), (IcStepDown_transform), (IcSet_transform),
	(IcBuildCompositeOperand), (pixman_compositeGeneral):
	* src/icimage.h:

	s/pixman_compositeOperand/FbCompositeOperand/g.


Index: iccompose.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccompose.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- iccompose.c	24 Jun 2005 02:35:45 -0000	1.19
+++ iccompose.c	24 Jun 2005 02:39:12 -0000	1.20
@@ -36,8 +36,8 @@
  */
 
 static uint32_t
-IcCombineMaskU (pixman_compositeOperand   *src,
-		pixman_compositeOperand   *msk)
+IcCombineMaskU (FbCompositeOperand   *src,
+		FbCompositeOperand   *msk)
 {
     uint32_t  x;
     uint16_t  a;
@@ -63,8 +63,8 @@
[...1411 lines suppressed...]
-			 pixman_compositeOperand op[4],
+			 FbCompositeOperand op[4],
 			 int16_t		    x,
 			 int16_t		    y,
 			 int		    transform,
@@ -2678,10 +2678,10 @@
 		    uint16_t	width,
 		    uint16_t	height)
 {
-    pixman_compositeOperand	src[4],msk[4],dst[4],*pmsk;
-    pixman_compositeOperand	*srcPict, *srcAlpha;
-    pixman_compositeOperand	*dstPict, *dstAlpha;
-    pixman_compositeOperand	*mskPict = 0, *mskAlpha = 0;
+    FbCompositeOperand	src[4],msk[4],dst[4],*pmsk;
+    FbCompositeOperand	*srcPict, *srcAlpha;
+    FbCompositeOperand	*dstPict, *dstAlpha;
+    FbCompositeOperand	*mskPict = 0, *mskAlpha = 0;
     IcCombineFunc	f;
     int			w;
 

Index: icimage.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- icimage.h	26 May 2005 20:02:31 -0000	1.23
+++ icimage.h	24 Jun 2005 02:39:12 -0000	1.24
@@ -245,15 +245,15 @@
 				  uint16_t     width,
 				  uint16_t     height);
 
-typedef struct _pixman_compositeOperand pixman_compositeOperand;
+typedef struct _FbCompositeOperand FbCompositeOperand;
 
-typedef uint32_t (*pixman_compositeFetch)(pixman_compositeOperand *op);
-typedef void (*pixman_compositeStore) (pixman_compositeOperand *op, uint32_t value);
+typedef uint32_t (*pixman_compositeFetch)(FbCompositeOperand *op);
+typedef void (*pixman_compositeStore) (FbCompositeOperand *op, uint32_t value);
 
-typedef void (*pixman_compositeStep) (pixman_compositeOperand *op);
-typedef void (*pixman_compositeSet) (pixman_compositeOperand *op, int x, int y);
+typedef void (*pixman_compositeStep) (FbCompositeOperand *op);
+typedef void (*pixman_compositeSet) (FbCompositeOperand *op, int x, int y);
 
-struct _pixman_compositeOperand {
+struct _FbCompositeOperand {
     union {
 	struct {
 	    pixman_bits_t		*top_line;
@@ -295,9 +295,9 @@
     pixman_region16_t		*src_clip;
 };
 
-typedef void (*IcCombineFunc) (pixman_compositeOperand	*src,
-			       pixman_compositeOperand	*msk,
-			       pixman_compositeOperand	*dst);
+typedef void (*IcCombineFunc) (FbCompositeOperand	*src,
+			       FbCompositeOperand	*msk,
+			       FbCompositeOperand	*dst);
 
 typedef struct _IcAccessMap {
     uint32_t		format_code;
@@ -315,7 +315,7 @@
 
 pixman_private int
 IcBuildCompositeOperand (pixman_image_t	    *image,
-			 pixman_compositeOperand op[4],
+			 FbCompositeOperand op[4],
 			 int16_t		    x,
 			 int16_t		    y,
 			 int		    transform,