[cairo-commit] libpixman/src ic.c,1.27,1.28
Jeff Muizelaar
commit at pdx.freedesktop.org
Sat Jul 9 18:13:16 PDT 2005
Committed by: jrmuizel
Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv12685/src
Modified Files:
ic.c
Log Message:
2005-07-09 Jeff Muizelaar <jeff at infidigm.net>
* src/ic.c: (fbCompositeSolidMask_nx8x8888),
(fbCompositeSolidMask_nx8888x8888C),
(fbCompositeSolidMask_nx8x0888), (fbCompositeSolidMask_nx8x0565),
(fbCompositeSolidMask_nx8888x0565C), (fbCompositeSrc_8888x8888),
(fbCompositeSrc_8888x0888), (fbCompositeSrc_8888x0565),
(fbCompositeSrc_0565x0565), (fbCompositeSrcAdd_8000x8000),
(fbCompositeSrcAdd_8888x8888), (fbCompositeSrcAdd_1000x1000),
(fbCompositeSolidMask_nx1xn), (pixman_composite):
More misc merging. Mostly s/pixman_composite/fbComposite/.
Index: ic.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ic.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ic.c 9 Jul 2005 22:47:43 -0000 1.27
+++ ic.c 10 Jul 2005 01:13:14 -0000 1.28
@@ -100,13 +100,13 @@
FbGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
switch (__bpp__) { \
case 32: \
- (bits) = *(uint32_t *) __bits__; \
+ (bits) = *(CARD32 *) __bits__; \
break; \
case 24: \
- (bits) = Fetch24 ((uint8_t *) __bits__); \
+ (bits) = Fetch24 ((CARD8 *) __bits__); \
break; \
case 16: \
- (bits) = *(uint16_t *) __bits__; \
+ (bits) = *(CARD16 *) __bits__; \
(bits) = cvt0565to8888(bits); \
break; \
default: \
@@ -135,7 +135,7 @@
*/
static void
-pixman_compositeSolidMask_nx8x8888 (pixman_operator_t op,
+fbCompositeSolidMask_nx8x8888 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -193,7 +193,7 @@
}
static void
-pixman_compositeSolidMask_nx8888x8888C (pixman_operator_t op,
+fbCompositeSolidMask_nx8888x8888C (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -266,7 +266,7 @@
}
static void
-pixman_compositeSolidMask_nx8x0888 (pixman_operator_t op,
+fbCompositeSolidMask_nx8x0888 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -328,7 +328,7 @@
}
static void
-pixman_compositeSolidMask_nx8x0565 (pixman_operator_t op,
+fbCompositeSolidMask_nx8x0565 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -391,7 +391,7 @@
}
static void
-pixman_compositeSolidMask_nx8888x0565C (pixman_operator_t op,
+fbCompositeSolidMask_nx8888x0565C (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -464,7 +464,7 @@
}
static void
-pixman_compositeSrc_8888x8888 (pixman_operator_t op,
+fbCompositeSrc_8888x8888 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -510,7 +510,7 @@
}
static void
-pixman_compositeSrc_8888x0888 (pixman_operator_t op,
+fbCompositeSrc_8888x0888 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -559,7 +559,7 @@
}
static void
-pixman_compositeSrc_8888x0565 (pixman_operator_t op,
+fbCompositeSrc_8888x0565 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -611,7 +611,7 @@
}
static void
-pixman_compositeSrc_0565x0565 (pixman_operator_t op,
+fbCompositeSrc_0565x0565 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -647,7 +647,7 @@
}
static void
-pixman_compositeSrcAdd_8000x8000 (pixman_operator_t op,
+fbCompositeSrcAdd_8000x8000 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -697,7 +697,7 @@
}
static void
-pixman_compositeSrcAdd_8888x8888 (pixman_operator_t op,
+fbCompositeSrcAdd_8888x8888 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -754,7 +754,7 @@
}
static void
-pixman_compositeSrcAdd_1000x1000 (pixman_operator_t op,
+fbCompositeSrcAdd_1000x1000 (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -797,7 +797,7 @@
}
static void
-pixman_compositeSolidMask_nx1xn (pixman_operator_t op,
+fbCompositeSolidMask_nx1xn (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pMask,
PicturePtr pDst,
@@ -939,17 +939,17 @@
switch (pDst->format_code) {
case PICT_r5g6b5:
case PICT_b5g6r5:
- func = pixman_compositeSolidMask_nx8x0565;
+ func = fbCompositeSolidMask_nx8x0565;
break;
case PICT_r8g8b8:
case PICT_b8g8r8:
- func = pixman_compositeSolidMask_nx8x0888;
+ func = fbCompositeSolidMask_nx8x0888;
break;
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
- func = pixman_compositeSolidMask_nx8x8888;
+ func = fbCompositeSolidMask_nx8x8888;
break;
}
break;
@@ -958,10 +958,10 @@
switch (pDst->format_code) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
- func = pixman_compositeSolidMask_nx8888x8888C;
+ func = fbCompositeSolidMask_nx8888x8888C;
break;
case PICT_r5g6b5:
- func = pixman_compositeSolidMask_nx8888x0565C;
+ func = fbCompositeSolidMask_nx8888x0565C;
break;
}
}
@@ -971,10 +971,10 @@
switch (pDst->format_code) {
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
- func = pixman_compositeSolidMask_nx8888x8888C;
+ func = fbCompositeSolidMask_nx8888x8888C;
break;
case PICT_b5g6r5:
- func = pixman_compositeSolidMask_nx8888x0565C;
+ func = fbCompositeSolidMask_nx8888x0565C;
break;
}
}
@@ -989,7 +989,7 @@
case PICT_x8r8g8b8:
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
- func = pixman_compositeSolidMask_nx1xn;
+ func = fbCompositeSolidMask_nx1xn;
break;
}
}
@@ -1003,13 +1003,13 @@
switch (pDst->format_code) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
- func = pixman_compositeSrc_8888x8888;
+ func = fbCompositeSrc_8888x8888;
break;
case PICT_r8g8b8:
- func = pixman_compositeSrc_8888x0888;
+ func = fbCompositeSrc_8888x0888;
break;
case PICT_r5g6b5:
- func = pixman_compositeSrc_8888x0565;
+ func = fbCompositeSrc_8888x0565;
break;
}
break;
@@ -1017,27 +1017,27 @@
switch (pDst->format_code) {
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
- func = pixman_compositeSrc_8888x8888;
+ func = fbCompositeSrc_8888x8888;
break;
case PICT_b8g8r8:
- func = pixman_compositeSrc_8888x0888;
+ func = fbCompositeSrc_8888x0888;
break;
case PICT_b5g6r5:
- func = pixman_compositeSrc_8888x0565;
+ func = fbCompositeSrc_8888x0565;
break;
}
break;
case PICT_r5g6b5:
switch (pDst->format_code) {
case PICT_r5g6b5:
- func = pixman_compositeSrc_0565x0565;
+ func = fbCompositeSrc_0565x0565;
break;
}
break;
case PICT_b5g6r5:
switch (pDst->format_code) {
case PICT_b5g6r5:
- func = pixman_compositeSrc_0565x0565;
+ func = fbCompositeSrc_0565x0565;
break;
}
break;
@@ -1051,28 +1051,28 @@
case PICT_a8r8g8b8:
switch (pDst->format_code) {
case PICT_a8r8g8b8:
- func = pixman_compositeSrcAdd_8888x8888;
+ func = fbCompositeSrcAdd_8888x8888;
break;
}
break;
case PICT_a8b8g8r8:
switch (pDst->format_code) {
case PICT_a8b8g8r8:
- func = pixman_compositeSrcAdd_8888x8888;
+ func = fbCompositeSrcAdd_8888x8888;
break;
}
break;
case PICT_a8:
switch (pDst->format_code) {
case PICT_a8:
- func = pixman_compositeSrcAdd_8000x8000;
+ func = fbCompositeSrcAdd_8000x8000;
break;
}
break;
case PICT_a1:
switch (pDst->format_code) {
case PICT_a1:
- func = pixman_compositeSrcAdd_1000x1000;
+ func = fbCompositeSrcAdd_1000x1000;
break;
}
break;
More information about the cairo-commit
mailing list