[cairo-commit] libpixman/src iccompose.c,1.20,1.21
Jeff Muizelaar
commit at pdx.freedesktop.org
Thu Jun 23 19:41:14 PDT 2005
Committed by: jrmuizel
Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv22980/src
Modified Files:
iccompose.c
Log Message:
2005-06-23 Jeff Muizelaar <jeff at infidigm.net>
* src/iccompose.c: (fbCombineClear), (fbCombineSrcU),
(fbCombineSrcC), (fbCombineDst), (fbCombineOverU),
(fbCombineOverC), (fbCombineOverReverseU), (fbCombineOverReverseC),
(fbCombineInU), (fbCombineInC), (fbCombineInReverseU),
(fbCombineInReverseC), (fbCombineOutU), (fbCombineOutC),
(fbCombineOutReverseU), (fbCombineOutReverseC), (fbCombineAtopU),
(fbCombineAtopC), (fbCombineAtopReverseU), (fbCombineAtopReverseC),
(fbCombineXorU), (fbCombineXorC), (fbCombineAddU), (fbCombineAddC),
(fbCombineDisjointOverU), (fbCombineDisjointOverC),
(fbCombineDisjointOverReverseU), (fbCombineDisjointOverReverseC),
(fbCombineDisjointInU), (fbCombineDisjointInC),
(fbCombineDisjointInReverseU), (fbCombineDisjointInReverseC),
(fbCombineDisjointOutU), (fbCombineDisjointOutC),
(fbCombineDisjointOutReverseU), (fbCombineDisjointOutReverseC),
(fbCombineDisjointAtopU), (fbCombineDisjointAtopC),
(fbCombineDisjointAtopReverseU), (fbCombineDisjointAtopReverseC),
(fbCombineDisjointXorU), (fbCombineDisjointXorC),
(fbCombineConjointOverU), (fbCombineConjointOverC),
(fbCombineConjointOverReverseU), (fbCombineConjointOverReverseC),
(fbCombineConjointInU), (fbCombineConjointInC),
(fbCombineConjointInReverseU), (fbCombineConjointInReverseC),
(fbCombineConjointOutU), (fbCombineConjointOutC),
(fbCombineConjointOutReverseU), (fbCombineConjointOutReverseC),
(fbCombineConjointAtopU), (fbCombineConjointAtopC),
(fbCombineConjointAtopReverseU), (fbCombineConjointAtopReverseC),
(fbCombineConjointXorU), (fbCombineConjointXorC):
s/IcCombine/fbCombine/
Index: iccompose.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccompose.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- iccompose.c 24 Jun 2005 02:39:12 -0000 1.20
+++ iccompose.c 24 Jun 2005 02:41:09 -0000 1.21
@@ -202,7 +202,7 @@
* All of the composing functions
*/
static void
-IcCombineClear (FbCompositeOperand *src,
+fbCombineClear (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -210,7 +210,7 @@
}
static void
-IcCombineSrcU (FbCompositeOperand *src,
+fbCombineSrcU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -218,7 +218,7 @@
}
static void
-IcCombineSrcC (FbCompositeOperand *src,
+fbCombineSrcC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -226,7 +226,7 @@
}
static void
-IcCombineDst (FbCompositeOperand *src,
+fbCombineDst (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -234,7 +234,7 @@
}
static void
-IcCombineOverU (FbCompositeOperand *src,
+fbCombineOverU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -261,7 +261,7 @@
}
static void
-IcCombineOverC (FbCompositeOperand *src,
+fbCombineOverC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -290,7 +290,7 @@
}
static void
-IcCombineOverReverseU (FbCompositeOperand *src,
+fbCombineOverReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -317,7 +317,7 @@
}
static void
-IcCombineOverReverseC (FbCompositeOperand *src,
+fbCombineOverReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -344,7 +344,7 @@
}
static void
-IcCombineInU (FbCompositeOperand *src,
+fbCombineInU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -372,7 +372,7 @@
}
static void
-IcCombineInC (FbCompositeOperand *src,
+fbCombineInC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -400,7 +400,7 @@
}
static void
-IcCombineInReverseU (FbCompositeOperand *src,
+fbCombineInReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -428,7 +428,7 @@
}
static void
-IcCombineInReverseC (FbCompositeOperand *src,
+fbCombineInReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -456,7 +456,7 @@
}
static void
-IcCombineOutU (FbCompositeOperand *src,
+fbCombineOutU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -484,7 +484,7 @@
}
static void
-IcCombineOutC (FbCompositeOperand *src,
+fbCombineOutC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -512,7 +512,7 @@
}
static void
-IcCombineOutReverseU (FbCompositeOperand *src,
+fbCombineOutReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -540,7 +540,7 @@
}
static void
-IcCombineOutReverseC (FbCompositeOperand *src,
+fbCombineOutReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -568,7 +568,7 @@
}
static void
-IcCombineAtopU (FbCompositeOperand *src,
+fbCombineAtopU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -589,7 +589,7 @@
}
static void
-IcCombineAtopC (FbCompositeOperand *src,
+fbCombineAtopC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -613,7 +613,7 @@
}
static void
-IcCombineAtopReverseU (FbCompositeOperand *src,
+fbCombineAtopReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -634,7 +634,7 @@
}
static void
-IcCombineAtopReverseC (FbCompositeOperand *src,
+fbCombineAtopReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -657,7 +657,7 @@
}
static void
-IcCombineXorU (FbCompositeOperand *src,
+fbCombineXorU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -678,7 +678,7 @@
}
static void
-IcCombineXorC (FbCompositeOperand *src,
+fbCombineXorC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -701,7 +701,7 @@
}
static void
-IcCombineAddU (FbCompositeOperand *src,
+fbCombineAddU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -727,7 +727,7 @@
}
static void
-IcCombineAddC (FbCompositeOperand *src,
+fbCombineAddC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -938,7 +938,7 @@
}
static void
-IcCombineDisjointOverU (FbCompositeOperand *src,
+fbCombineDisjointOverU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -966,7 +966,7 @@
}
static void
-IcCombineDisjointOverC (FbCompositeOperand *src,
+fbCombineDisjointOverC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -974,7 +974,7 @@
}
static void
-IcCombineDisjointOverReverseU (FbCompositeOperand *src,
+fbCombineDisjointOverReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -982,7 +982,7 @@
}
static void
-IcCombineDisjointOverReverseC (FbCompositeOperand *src,
+fbCombineDisjointOverReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -990,7 +990,7 @@
}
static void
-IcCombineDisjointInU (FbCompositeOperand *src,
+fbCombineDisjointInU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -998,7 +998,7 @@
}
static void
-IcCombineDisjointInC (FbCompositeOperand *src,
+fbCombineDisjointInC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1006,7 +1006,7 @@
}
static void
-IcCombineDisjointInReverseU (FbCompositeOperand *src,
+fbCombineDisjointInReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1014,7 +1014,7 @@
}
static void
-IcCombineDisjointInReverseC (FbCompositeOperand *src,
+fbCombineDisjointInReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1022,7 +1022,7 @@
}
static void
-IcCombineDisjointOutU (FbCompositeOperand *src,
+fbCombineDisjointOutU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1030,7 +1030,7 @@
}
static void
-IcCombineDisjointOutC (FbCompositeOperand *src,
+fbCombineDisjointOutC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1038,7 +1038,7 @@
}
static void
-IcCombineDisjointOutReverseU (FbCompositeOperand *src,
+fbCombineDisjointOutReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1046,7 +1046,7 @@
}
static void
-IcCombineDisjointOutReverseC (FbCompositeOperand *src,
+fbCombineDisjointOutReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1054,7 +1054,7 @@
}
static void
-IcCombineDisjointAtopU (FbCompositeOperand *src,
+fbCombineDisjointAtopU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1062,7 +1062,7 @@
}
static void
-IcCombineDisjointAtopC (FbCompositeOperand *src,
+fbCombineDisjointAtopC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1070,7 +1070,7 @@
}
static void
-IcCombineDisjointAtopReverseU (FbCompositeOperand *src,
+fbCombineDisjointAtopReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1078,7 +1078,7 @@
}
static void
-IcCombineDisjointAtopReverseC (FbCompositeOperand *src,
+fbCombineDisjointAtopReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1086,7 +1086,7 @@
}
static void
-IcCombineDisjointXorU (FbCompositeOperand *src,
+fbCombineDisjointXorU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1094,7 +1094,7 @@
}
static void
-IcCombineDisjointXorC (FbCompositeOperand *src,
+fbCombineDisjointXorC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1247,7 +1247,7 @@
}
static void
-IcCombineConjointOverU (FbCompositeOperand *src,
+fbCombineConjointOverU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1278,7 +1278,7 @@
}
static void
-IcCombineConjointOverC (FbCompositeOperand *src,
+fbCombineConjointOverC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1286,7 +1286,7 @@
}
static void
-IcCombineConjointOverReverseU (FbCompositeOperand *src,
+fbCombineConjointOverReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1294,7 +1294,7 @@
}
static void
-IcCombineConjointOverReverseC (FbCompositeOperand *src,
+fbCombineConjointOverReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1302,7 +1302,7 @@
}
static void
-IcCombineConjointInU (FbCompositeOperand *src,
+fbCombineConjointInU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1310,7 +1310,7 @@
}
static void
-IcCombineConjointInC (FbCompositeOperand *src,
+fbCombineConjointInC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1318,7 +1318,7 @@
}
static void
-IcCombineConjointInReverseU (FbCompositeOperand *src,
+fbCombineConjointInReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1326,7 +1326,7 @@
}
static void
-IcCombineConjointInReverseC (FbCompositeOperand *src,
+fbCombineConjointInReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1334,7 +1334,7 @@
}
static void
-IcCombineConjointOutU (FbCompositeOperand *src,
+fbCombineConjointOutU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1342,7 +1342,7 @@
}
static void
-IcCombineConjointOutC (FbCompositeOperand *src,
+fbCombineConjointOutC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1350,7 +1350,7 @@
}
static void
-IcCombineConjointOutReverseU (FbCompositeOperand *src,
+fbCombineConjointOutReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1358,7 +1358,7 @@
}
static void
-IcCombineConjointOutReverseC (FbCompositeOperand *src,
+fbCombineConjointOutReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1366,7 +1366,7 @@
}
static void
-IcCombineConjointAtopU (FbCompositeOperand *src,
+fbCombineConjointAtopU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1374,7 +1374,7 @@
}
static void
-IcCombineConjointAtopC (FbCompositeOperand *src,
+fbCombineConjointAtopC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1382,7 +1382,7 @@
}
static void
-IcCombineConjointAtopReverseU (FbCompositeOperand *src,
+fbCombineConjointAtopReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1390,7 +1390,7 @@
}
static void
-IcCombineConjointAtopReverseC (FbCompositeOperand *src,
+fbCombineConjointAtopReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1398,7 +1398,7 @@
}
static void
-IcCombineConjointXorU (FbCompositeOperand *src,
+fbCombineConjointXorU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1406,7 +1406,7 @@
}
static void
-IcCombineConjointXorC (FbCompositeOperand *src,
+fbCombineConjointXorC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
@@ -1414,97 +1414,97 @@
}
static IcCombineFunc const IcCombineFuncU[] = {
- IcCombineClear,
- IcCombineSrcU,
- IcCombineDst,
- IcCombineOverU,
- IcCombineOverReverseU,
- IcCombineInU,
- IcCombineInReverseU,
- IcCombineOutU,
- IcCombineOutReverseU,
- IcCombineAtopU,
- IcCombineAtopReverseU,
- IcCombineXorU,
- IcCombineAddU,
- IcCombineDisjointOverU, /* Saturate */
+ fbCombineClear,
+ fbCombineSrcU,
+ fbCombineDst,
+ fbCombineOverU,
+ fbCombineOverReverseU,
+ fbCombineInU,
+ fbCombineInReverseU,
+ fbCombineOutU,
+ fbCombineOutReverseU,
+ fbCombineAtopU,
+ fbCombineAtopReverseU,
+ fbCombineXorU,
+ fbCombineAddU,
+ fbCombineDisjointOverU, /* Saturate */
0,
0,
- IcCombineClear,
- IcCombineSrcU,
- IcCombineDst,
- IcCombineDisjointOverU,
- IcCombineDisjointOverReverseU,
- IcCombineDisjointInU,
- IcCombineDisjointInReverseU,
- IcCombineDisjointOutU,
- IcCombineDisjointOutReverseU,
- IcCombineDisjointAtopU,
- IcCombineDisjointAtopReverseU,
- IcCombineDisjointXorU,
+ fbCombineClear,
+ fbCombineSrcU,
+ fbCombineDst,
+ fbCombineDisjointOverU,
+ fbCombineDisjointOverReverseU,
+ fbCombineDisjointInU,
+ fbCombineDisjointInReverseU,
+ fbCombineDisjointOutU,
+ fbCombineDisjointOutReverseU,
+ fbCombineDisjointAtopU,
+ fbCombineDisjointAtopReverseU,
+ fbCombineDisjointXorU,
0,
0,
0,
0,
- IcCombineClear,
- IcCombineSrcU,
- IcCombineDst,
- IcCombineConjointOverU,
- IcCombineConjointOverReverseU,
- IcCombineConjointInU,
- IcCombineConjointInReverseU,
- IcCombineConjointOutU,
- IcCombineConjointOutReverseU,
- IcCombineConjointAtopU,
- IcCombineConjointAtopReverseU,
- IcCombineConjointXorU,
+ fbCombineClear,
+ fbCombineSrcU,
+ fbCombineDst,
+ fbCombineConjointOverU,
+ fbCombineConjointOverReverseU,
+ fbCombineConjointInU,
+ fbCombineConjointInReverseU,
+ fbCombineConjointOutU,
+ fbCombineConjointOutReverseU,
+ fbCombineConjointAtopU,
+ fbCombineConjointAtopReverseU,
+ fbCombineConjointXorU,
};
static IcCombineFunc const IcCombineFuncC[] = {
- IcCombineClear,
- IcCombineSrcC,
- IcCombineDst,
- IcCombineOverC,
- IcCombineOverReverseC,
- IcCombineInC,
- IcCombineInReverseC,
- IcCombineOutC,
- IcCombineOutReverseC,
- IcCombineAtopC,
- IcCombineAtopReverseC,
- IcCombineXorC,
- IcCombineAddC,
- IcCombineDisjointOverC, /* Saturate */
+ fbCombineClear,
+ fbCombineSrcC,
+ fbCombineDst,
+ fbCombineOverC,
+ fbCombineOverReverseC,
+ fbCombineInC,
+ fbCombineInReverseC,
+ fbCombineOutC,
+ fbCombineOutReverseC,
+ fbCombineAtopC,
+ fbCombineAtopReverseC,
+ fbCombineXorC,
+ fbCombineAddC,
+ fbCombineDisjointOverC, /* Saturate */
0,
0,
- IcCombineClear, /* 0x10 */
- IcCombineSrcC,
- IcCombineDst,
- IcCombineDisjointOverC,
- IcCombineDisjointOverReverseC,
- IcCombineDisjointInC,
- IcCombineDisjointInReverseC,
- IcCombineDisjointOutC,
- IcCombineDisjointOutReverseC,
- IcCombineDisjointAtopC,
- IcCombineDisjointAtopReverseC,
- IcCombineDisjointXorC, /* 0x1b */
+ fbCombineClear, /* 0x10 */
+ fbCombineSrcC,
+ fbCombineDst,
+ fbCombineDisjointOverC,
+ fbCombineDisjointOverReverseC,
+ fbCombineDisjointInC,
+ fbCombineDisjointInReverseC,
+ fbCombineDisjointOutC,
+ fbCombineDisjointOutReverseC,
+ fbCombineDisjointAtopC,
+ fbCombineDisjointAtopReverseC,
+ fbCombineDisjointXorC, /* 0x1b */
0,
0,
0,
0,
- IcCombineClear,
- IcCombineSrcC,
- IcCombineDst,
- IcCombineConjointOverC,
- IcCombineConjointOverReverseC,
- IcCombineConjointInC,
- IcCombineConjointInReverseC,
- IcCombineConjointOutC,
- IcCombineConjointOutReverseC,
- IcCombineConjointAtopC,
- IcCombineConjointAtopReverseC,
- IcCombineConjointXorC,
+ fbCombineClear,
+ fbCombineSrcC,
+ fbCombineDst,
+ fbCombineConjointOverC,
+ fbCombineConjointOverReverseC,
+ fbCombineConjointInC,
+ fbCombineConjointInReverseC,
+ fbCombineConjointOutC,
+ fbCombineConjointOutReverseC,
+ fbCombineConjointAtopC,
+ fbCombineConjointAtopReverseC,
+ fbCombineConjointXorC,
};
/*
More information about the cairo-commit
mailing list