[Commit]
libic/src ic.c, 1.6, 1.7 ic.h, 1.12, 1.13 iccompose.c, 1.6,
1.7 icimage.h, 1.9, 1.10 icint.h, 1.10, 1.11
Carl Worth
commit at keithp.com
Tue Jul 29 15:45:23 PDT 2003
Committed by: cworth
Update of /local/src/CVS/libic/src
In directory home.keithp.com:/tmp/cvs-serv14539/src
Modified Files:
ic.c ic.h iccompose.c icimage.h icint.h
Log Message:
Replaced CARD*/INT* datatypes with stdint types (vektor at dumbterm.net).
Index: ic.c
===================================================================
RCS file: /local/src/CVS/libic/src/ic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ic.c 29 May 2003 02:31:30 -0000 1.6
+++ ic.c 29 Jul 2003 21:45:20 -0000 1.7
@@ -40,30 +40,30 @@
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch24(a) ((unsigned long) (a) & 1 ? \
- ((*(a) << 16) | *((CARD16 *) ((a)+1))) : \
- ((*((CARD16 *) (a)) << 8) | *((a)+2)))
+ ((*(a) << 16) | *((uint16_t *) ((a)+1))) : \
+ ((*((uint16_t *) (a)) << 8) | *((a)+2)))
#define Store24(a,v) ((unsigned long) (a) & 1 ? \
- ((*(a) = (CARD8) ((v) >> 16)), \
- (*((CARD16 *) ((a)+1)) = (CARD16) (v))) : \
- ((*((CARD16 *) (a)) = (CARD16) ((v) >> 8)), \
- (*((a)+2) = (CARD8) (v))))
+ ((*(a) = (uint8_t) ((v) >> 16)), \
+ (*((uint16_t *) ((a)+1)) = (uint16_t) (v))) : \
+ ((*((uint16_t *) (a)) = (uint16_t) ((v) >> 8)), \
+ (*((a)+2) = (uint8_t) (v))))
#else
#define Fetch24(a) ((unsigned long) (a) & 1 ? \
- ((*(a)) | (*((CARD16 *) ((a)+1)) << 8)) : \
- ((*((CARD16 *) (a))) | (*((a)+2) << 16)))
+ ((*(a)) | (*((uint16_t *) ((a)+1)) << 8)) : \
+ ((*((uint16_t *) (a))) | (*((a)+2) << 16)))
#define Store24(a,v) ((unsigned long) (a) & 1 ? \
- ((*(a) = (CARD8) (v)), \
- (*((CARD16 *) ((a)+1)) = (CARD16) ((v) >> 8))) : \
- ((*((CARD16 *) (a)) = (CARD16) (v)),\
- (*((a)+2) = (CARD8) ((v) >> 16))))
+ ((*(a) = (uint8_t) (v)), \
+ (*((uint16_t *) ((a)+1)) = (uint16_t) ((v) >> 8))) : \
+ ((*((uint16_t *) (a)) = (uint16_t) (v)),\
+ (*((a)+2) = (uint8_t) ((v) >> 16))))
#endif
-CARD32
-IcOver (CARD32 x, CARD32 y)
+uint32_t
+IcOver (uint32_t x, uint32_t y)
{
- CARD16 a = ~x >> 24;
- CARD16 t;
- CARD32 m,n,o,p;
+ uint16_t a = ~x >> 24;
+ uint16_t t;
+ uint32_t m,n,o,p;
m = IcOverU(x,y,0,a,t);
n = IcOverU(x,y,8,a,t);
@@ -72,12 +72,12 @@
return m|n|o|p;
}
-CARD32
-IcOver24 (CARD32 x, CARD32 y)
+uint32_t
+IcOver24 (uint32_t x, uint32_t y)
{
- CARD16 a = ~x >> 24;
- CARD16 t;
- CARD32 m,n,o;
+ uint16_t a = ~x >> 24;
+ uint16_t t;
+ uint32_t m,n,o;
m = IcOverU(x,y,0,a,t);
n = IcOverU(x,y,8,a,t);
@@ -85,12 +85,12 @@
return m|n|o;
}
-CARD32
-IcIn (CARD32 x, CARD8 y)
+uint32_t
+IcIn (uint32_t x, uint8_t y)
{
- CARD16 a = y;
- CARD16 t;
- CARD32 m,n,o,p;
+ uint16_t a = y;
+ uint16_t t;
+ uint32_t m,n,o,p;
m = IcInU(x,0,a,t);
n = IcInU(x,8,a,t);
@@ -108,13 +108,13 @@
IcGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
switch (__bpp__) { \
case 32: \
- (bits) = *(CARD32 *) __bits__; \
+ (bits) = *(uint32_t *) __bits__; \
break; \
case 24: \
- (bits) = Fetch24 ((CARD8 *) __bits__); \
+ (bits) = Fetch24 ((uint8_t *) __bits__); \
break; \
case 16: \
- (bits) = *(CARD16 *) __bits__; \
+ (bits) = *(uint16_t *) __bits__; \
(bits) = cvt0565to8888(bits); \
break; \
default: \
@@ -143,24 +143,24 @@
*/
void
-IcCompositeSolidMask_nx8x8888 (CARD8 op,
+IcCompositeSolidMask_nx8x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 src, srca;
- CARD32 *dstLine, *dst, d, dstMask;
- CARD8 *maskLine, *mask, m;
+ uint32_t src, srca;
+ uint32_t *dstLine, *dst, d, dstMask;
+ uint8_t *maskLine, *mask, m;
IcStride dstStride, maskStride;
- CARD16 w;
+ uint16_t w;
IcComposeGetSolid(iSrc, src);
@@ -169,8 +169,8 @@
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, CARD8, maskStride, maskLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -201,25 +201,25 @@
}
void
-IcCompositeSolidMask_nx8888x8888C (CARD8 op,
+IcCompositeSolidMask_nx8888x8888C (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 src, srca;
- CARD32 *dstLine, *dst, d, dstMask;
- CARD32 *maskLine, *mask, ma;
+ uint32_t src, srca;
+ uint32_t *dstLine, *dst, d, dstMask;
+ uint32_t *maskLine, *mask, ma;
IcStride dstStride, maskStride;
- CARD16 w;
- CARD32 m, n, o, p;
+ uint16_t w;
+ uint32_t m, n, o, p;
IcComposeGetSolid(iSrc, src);
@@ -228,8 +228,8 @@
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, CARD32, maskStride, maskLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ IcComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
while (height--)
{
@@ -253,13 +253,13 @@
{
d = *dst;
#define IcInOverC(src,srca,msk,dst,i,result) { \
- CARD16 __a = IcGet8(msk,i); \
- CARD32 __t, __ta; \
- CARD32 __i; \
+ uint16_t __a = IcGet8(msk,i); \
+ uint32_t __t, __ta; \
+ uint32_t __i; \
__t = IcIntMult (IcGet8(src,i), __a,__i); \
- __ta = (CARD8) ~IcIntMult (srca, __a,__i); \
+ __ta = (uint8_t) ~IcIntMult (srca, __a,__i); \
__t = __t + IcIntMult(IcGet8(dst,i),__ta,__i); \
- __t = (CARD32) (CARD8) (__t | (-(__t >> 8))); \
+ __t = (uint32_t) (uint8_t) (__t | (-(__t >> 8))); \
result = __t << (i); \
}
IcInOverC (src, srca, ma, d, 0, m);
@@ -274,25 +274,25 @@
}
void
-IcCompositeSolidMask_nx8x0888 (CARD8 op,
+IcCompositeSolidMask_nx8x0888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 src, srca;
- CARD8 *dstLine, *dst;
- CARD32 d;
- CARD8 *maskLine, *mask, m;
+ uint32_t src, srca;
+ uint8_t *dstLine, *dst;
+ uint32_t d;
+ uint8_t *maskLine, *mask, m;
IcStride dstStride, maskStride;
- CARD16 w;
+ uint16_t w;
IcComposeGetSolid(iSrc, src);
@@ -300,8 +300,8 @@
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, CARD8, dstStride, dstLine, 3);
- IcComposeGetStart (iMask, xMask, yMask, CARD8, maskStride, maskLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
+ IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -336,25 +336,25 @@
}
void
-IcCompositeSolidMask_nx8x0565 (CARD8 op,
+IcCompositeSolidMask_nx8x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 src, srca;
- CARD16 *dstLine, *dst;
- CARD32 d;
- CARD8 *maskLine, *mask, m;
+ uint32_t src, srca;
+ uint16_t *dstLine, *dst;
+ uint32_t d;
+ uint8_t *maskLine, *mask, m;
IcStride dstStride, maskStride;
- CARD16 w;
+ uint16_t w;
IcComposeGetSolid(iSrc, src);
@@ -362,8 +362,8 @@
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, CARD16, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, CARD8, maskStride, maskLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -399,27 +399,27 @@
}
void
-IcCompositeSolidMask_nx8888x0565C (CARD8 op,
+IcCompositeSolidMask_nx8888x0565C (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 src, srca;
- CARD16 src16;
- CARD16 *dstLine, *dst;
- CARD32 d;
- CARD32 *maskLine, *mask, ma;
+ uint32_t src, srca;
+ uint16_t src16;
+ uint16_t *dstLine, *dst;
+ uint32_t d;
+ uint32_t *maskLine, *mask, ma;
IcStride dstStride, maskStride;
- CARD16 w;
- CARD32 m, n, o;
+ uint16_t w;
+ uint32_t m, n, o;
IcComposeGetSolid(iSrc, src);
@@ -429,8 +429,8 @@
src16 = cvt8888to0565(src);
- IcComposeGetStart (iDst, xDst, yDst, CARD16, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, CARD32, maskStride, maskLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ IcComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
while (height--)
{
@@ -472,27 +472,27 @@
}
void
-IcCompositeSrc_8888x8888 (CARD8 op,
+IcCompositeSrc_8888x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 *dstLine, *dst, dstMask;
- CARD32 *srcLine, *src, s;
+ uint32_t *dstLine, *dst, dstMask;
+ uint32_t *srcLine, *src, s;
IcStride dstStride, srcStride;
- CARD8 a;
- CARD16 w;
+ uint8_t a;
+ uint16_t w;
- IcComposeGetStart (iDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD32, srcStride, srcLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
dstMask = IcFullMask (iDst->pixels->depth);
@@ -518,28 +518,28 @@
}
void
-IcCompositeSrc_8888x0888 (CARD8 op,
+IcCompositeSrc_8888x0888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD8 *dstLine, *dst;
- CARD32 d;
- CARD32 *srcLine, *src, s;
- CARD8 a;
+ uint8_t *dstLine, *dst;
+ uint32_t d;
+ uint32_t *srcLine, *src, s;
+ uint8_t a;
IcStride dstStride, srcStride;
- CARD16 w;
+ uint16_t w;
- IcComposeGetStart (iDst, xDst, yDst, CARD8, dstStride, dstLine, 3);
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD32, srcStride, srcLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
while (height--)
{
@@ -567,28 +567,28 @@
}
void
-IcCompositeSrc_8888x0565 (CARD8 op,
+IcCompositeSrc_8888x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD16 *dstLine, *dst;
- CARD32 d;
- CARD32 *srcLine, *src, s;
- CARD8 a;
+ uint16_t *dstLine, *dst;
+ uint32_t d;
+ uint32_t *srcLine, *src, s;
+ uint8_t a;
IcStride dstStride, srcStride;
- CARD16 w;
+ uint16_t w;
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD32, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, CARD16, dstStride, dstLine, 1);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
while (height--)
{
@@ -619,27 +619,27 @@
}
void
-IcCompositeSrc_0565x0565 (CARD8 op,
+IcCompositeSrc_0565x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD16 *dstLine, *dst;
- CARD16 *srcLine, *src;
+ uint16_t *dstLine, *dst;
+ uint16_t *srcLine, *src;
IcStride dstStride, srcStride;
- CARD16 w;
+ uint16_t w;
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD16, srcStride, srcLine, 1);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint16_t, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, CARD16, dstStride, dstLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
while (height--)
{
@@ -655,28 +655,28 @@
}
void
-IcCompositeSrcAdd_8000x8000 (CARD8 op,
+IcCompositeSrcAdd_8000x8000 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD8 *dstLine, *dst;
- CARD8 *srcLine, *src;
+ uint8_t *dstLine, *dst;
+ uint8_t *srcLine, *src;
IcStride dstStride, srcStride;
- CARD8 w;
- CARD8 s, d;
- CARD16 t;
+ uint8_t w;
+ uint8_t s, d;
+ uint16_t t;
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD8, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, CARD8, dstStride, dstLine, 1);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
while (height--)
{
@@ -701,29 +701,29 @@
}
void
-IcCompositeSrcAdd_8888x8888 (CARD8 op,
+IcCompositeSrcAdd_8888x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
- CARD32 *dstLine, *dst;
- CARD32 *srcLine, *src;
+ uint32_t *dstLine, *dst;
+ uint32_t *srcLine, *src;
IcStride dstStride, srcStride;
- CARD16 w;
- CARD32 s, d;
- CARD16 t;
- CARD32 m,n,o,p;
+ uint16_t w;
+ uint32_t s, d;
+ uint16_t t;
+ uint32_t m,n,o,p;
- IcComposeGetStart (iSrc, xSrc, ySrc, CARD32, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
+ IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
while (height--)
{
@@ -754,18 +754,18 @@
}
void
-IcCompositeSrcAdd_1000x1000 (CARD8 op,
+IcCompositeSrcAdd_1000x1000 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
IcBits *dstBits, *srcBits;
IcStride dstStride, srcStride;
@@ -797,18 +797,18 @@
}
void
-IcCompositeSolidMask_nx1xn (CARD8 op,
+IcCompositeSolidMask_nx1xn (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
IcBits *dstBits;
IcStip *maskBits;
Index: ic.h
===================================================================
RCS file: /local/src/CVS/libic/src/ic.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ic.h 9 Jul 2003 00:06:16 -0000 1.12
+++ ic.h 29 Jul 2003 21:45:20 -0000 1.13
@@ -22,24 +22,24 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _IC_H_
-#define _IC_H_
+#ifndef IC_H_INCLUDED
+#define IC_H_INCLUDED
-#include <stdint.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
-#include "pixregion.h"
+#include <pixregion.h>
/* NOTE: Must be manually synchronized with LIBIC_VERSION in configure.in */
#define IC_MAJOR 0
#define IC_MINOR 1
#define IC_REVISION 0
-#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
-#define _ICFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
-#define _ICFUNCPROTOEND }
-#else
-#define _ICFUNCPROTOBEGIN
-#define _ICFUNCPROTOEND
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
#endif
/* icformat.c */
@@ -58,8 +58,6 @@
int alpha, alphaMask;
} IcFormat;
-_ICFUNCPROTOBEGIN
-
void
IcFormatInit (IcFormat *format, IcFormatName name);
@@ -265,6 +263,8 @@
int width,
int height);
-_ICFUNCPROTOEND
+#if defined(__cplusplus) || defined(c_plusplus)
+};
+#endif
-#endif /* _IC_H_ */
+#endif /* IC_H_INCLUDED */
Index: iccompose.c
===================================================================
RCS file: /local/src/CVS/libic/src/iccompose.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- iccompose.c 29 May 2003 02:31:30 -0000 1.6
+++ iccompose.c 29 Jul 2003 21:45:20 -0000 1.7
@@ -38,14 +38,14 @@
* Combine src and mask using IN
*/
-CARD32
+uint32_t
IcCombineMaskU (IcCompositeOperand *src,
IcCompositeOperand *msk)
{
- CARD32 x;
- CARD16 a;
- CARD16 t;
[...1681 lines suppressed...]
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height)
{
IcCompositeOperand src[4],msk[4],dst[4],*pmsk;
IcCompositeOperand *srcPict, *srcAlpha;
Index: icimage.h
===================================================================
RCS file: /local/src/CVS/libic/src/icimage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- icimage.h 15 May 2003 01:09:10 -0000 1.9
+++ icimage.h 29 Jul 2003 21:45:20 -0000 1.10
@@ -56,9 +56,9 @@
#include <X11/Xutil.h>
#define IcIntMult(a,b,t) ( (t) = (a) * (b) + 0x80, ( ( ( (t)>>8 ) + (t) )>>8 ) )
-#define IcIntDiv(a,b) (((CARD16) (a) * 255) / (b))
+#define IcIntDiv(a,b) (((uint16_t) (a) * 255) / (b))
-#define IcGet8(v,i) ((CARD16) (CARD8) ((v) >> i))
+#define IcGet8(v,i) ((uint16_t) (uint8_t) ((v) >> i))
/*
* There are two ways of handling alpha -- either as a single unified value or
@@ -69,22 +69,22 @@
*/
#define IcOverU(x,y,i,a,t) ((t) = IcIntMult(IcGet8(y,i),(a),(t)) + IcGet8(x,i),\
- (CARD32) ((CARD8) ((t) | (0 - ((t) >> 8)))) << (i))
+ (uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
#define IcOverC(x,y,i,a,t) ((t) = IcIntMult(IcGet8(y,i),IcGet8(a,i),(t)) + IcGet8(x,i),\
- (CARD32) ((CARD8) ((t) | (0 - ((t) >> 8)))) << (i))
+ (uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
-#define IcInU(x,i,a,t) ((CARD32) IcIntMult(IcGet8(x,i),(a),(t)) << (i))
+#define IcInU(x,i,a,t) ((uint32_t) IcIntMult(IcGet8(x,i),(a),(t)) << (i))
-#define IcInC(x,i,a,t) ((CARD32) IcIntMult(IcGet8(x,i),IcGet8(a,i),(t)) << (i))
+#define IcInC(x,i,a,t) ((uint32_t) IcIntMult(IcGet8(x,i),IcGet8(a,i),(t)) << (i))
#define IcGen(x,y,i,ax,ay,t,u,v) ((t) = (IcIntMult(IcGet8(y,i),ay,(u)) + \
IcIntMult(IcGet8(x,i),ax,(v))),\
- (CARD32) ((CARD8) ((t) | \
+ (uint32_t) ((uint8_t) ((t) | \
(0 - ((t) >> 8)))) << (i))
#define IcAdd(x,y,i,t) ((t) = IcGet8(x,i) + IcGet8(y,i), \
- (CARD32) ((CARD8) ((t) | (0 - ((t) >> 8)))) << (i))
+ (uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
/*
typedef struct _IndexFormat {
@@ -98,8 +98,8 @@
/*
typedef struct _IcFormat {
- CARD32 id;
- CARD32 format;
+ uint32_t id;
+ uint32_t format;
unsigned char type;
unsigned char depth;
DirectFormatRec direct;
@@ -155,13 +155,13 @@
#define IC_MAX_INDEXED 256 /* XXX depth must be <= 8 */
#if IC_MAX_INDEXED <= 256
-typedef CARD8 IcIndexType;
+typedef uint8_t IcIndexType;
#endif
/* XXX: We're not supporting indexed operations, right?
typedef struct _IcIndexed {
Bool color;
- CARD32 rgba[IC_MAX_INDEXED];
+ uint32_t rgba[IC_MAX_INDEXED];
IcIndexType ent[32768];
} IcIndexedRec, *IcIndexedPtr;
*/
@@ -203,10 +203,10 @@
Bool
IcClipPicture (PixRegion *region,
IcImage *image,
- INT16 xReg,
- INT16 yReg,
- INT16 xPict,
- INT16 yPict);
+ int16_t xReg,
+ int16_t yReg,
+ int16_t xPict,
+ int16_t yPict);
*/
Bool
@@ -214,14 +214,14 @@
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
/*
Bool
@@ -230,12 +230,12 @@
/*
void
-IcGlyphs (CARD8 op,
+IcGlyphs (uint8_t op,
PicturePtr pSrc,
PicturePtr pDst,
PictFormatPtr maskFormat,
- INT16 xSrc,
- INT16 ySrc,
+ int16_t xSrc,
+ int16_t ySrc,
int nlist,
GlyphListPtr list,
GlyphPtr *glyphs);
@@ -243,7 +243,7 @@
/*
void
-IcCompositeRects (CARD8 op,
+IcCompositeRects (uint8_t op,
PicturePtr pDst,
xRenderColor *color,
int nRect,
@@ -253,26 +253,26 @@
IcImage *
IcCreateAlphaPicture (IcImage *dst,
IcFormat *format,
- CARD16 width,
- CARD16 height);
+ uint16_t width,
+ uint16_t height);
-typedef void (*CompositeFunc) (CARD8 op,
+typedef void (*CompositeFunc) (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
typedef struct _IcCompositeOperand IcCompositeOperand;
-typedef CARD32 (*IcCompositeFetch)(IcCompositeOperand *op);
-typedef void (*IcCompositeStore) (IcCompositeOperand *op, CARD32 value);
+typedef uint32_t (*IcCompositeFetch)(IcCompositeOperand *op);
+typedef void (*IcCompositeStore) (IcCompositeOperand *op, uint32_t value);
typedef void (*IcCompositeStep) (IcCompositeOperand *op);
typedef void (*IcCompositeSet) (IcCompositeOperand *op, int x, int y);
@@ -285,7 +285,7 @@
int start_offset;
IcBits *line;
- CARD32 offset;
+ uint32_t offset;
IcStride stride;
int bpp;
} drawable;
@@ -325,7 +325,7 @@
extern IcCombineFunc icCombineFunc[];
typedef struct _IcAccessMap {
- CARD32 format;
+ uint32_t format;
IcCompositeFetch fetch;
IcCompositeFetch fetcha;
IcCompositeStore store;
@@ -339,15 +339,15 @@
/* iccompose.c */
typedef struct _IcCompSrc {
- CARD32 value;
- CARD32 alpha;
+ uint32_t value;
+ uint32_t alpha;
} IcCompSrc;
/*
* All compositing operators *
*/
-CARD32
+uint32_t
IcCombineMaskU (IcCompositeOperand *src,
IcCompositeOperand *msk);
@@ -355,21 +355,21 @@
IcCombineMaskC (IcCompositeOperand *src,
IcCompositeOperand *msk);
-CARD32
+uint32_t
IcCombineMaskValueC (IcCompositeOperand *src,
IcCompositeOperand *msk);
-CARD32
+uint32_t
IcCombineMaskAlphaU (IcCompositeOperand *src,
IcCompositeOperand *msk);
-CARD32
+uint32_t
IcCombineMaskAlphaC (IcCompositeOperand *src,
IcCompositeOperand *msk);
#if 0
-CARD32
+uint32_t
IcCombineMask (IcCompositeOperand *src,
IcCompositeOperand *msk);
#endif
@@ -506,23 +506,23 @@
IcCompositeOperand *msk,
IcCompositeOperand *dst);
-CARD8
-IcCombineDisjointOutPart (CARD8 a, CARD8 b);
+uint8_t
+IcCombineDisjointOutPart (uint8_t a, uint8_t b);
-CARD8
-IcCombineDisjointInPart (CARD8 a, CARD8 b);
+uint8_t
+IcCombineDisjointInPart (uint8_t a, uint8_t b);
void
IcCombineDisjointGeneralU (IcCompositeOperand *src,
IcCompositeOperand *msk,
IcCompositeOperand *dst,
- CARD8 combine);
+ uint8_t combine);
void
IcCombineDisjointGeneralC (IcCompositeOperand *src,
IcCompositeOperand *msk,
IcCompositeOperand *dst,
- CARD8 combine);
+ uint8_t combine);
void
IcCombineDisjointOverU (IcCompositeOperand *src,
@@ -613,24 +613,24 @@
IcCompositeOperand *msk,
IcCompositeOperand *dst);
-CARD8
-IcCombineConjointOutPart (CARD8 a, CARD8 b);
+uint8_t
+IcCombineConjointOutPart (uint8_t a, uint8_t b);
-CARD8
-IcCombineConjointInPart (CARD8 a, CARD8 b);
+uint8_t
+IcCombineConjointInPart (uint8_t a, uint8_t b);
void
IcCombineConjointGeneralU (IcCompositeOperand *src,
IcCompositeOperand *msk,
IcCompositeOperand *dst,
- CARD8 combine);
+ uint8_t combine);
void
IcCombineConjointGeneralC (IcCompositeOperand *src,
IcCompositeOperand *msk,
IcCompositeOperand *dst,
- CARD8 combine);
+ uint8_t combine);
void
IcCombineConjointOverU (IcCompositeOperand *src,
@@ -725,434 +725,434 @@
* All fetch functions
*/
-CARD32
+uint32_t
IcFetch_a8r8g8b8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x8r8g8b8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a8b8g8r8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x8b8g8r8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_r8g8b8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_b8g8r8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_r5g6b5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_b5g6r5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a1r5g5b5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x1r5g5b5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a1b5g5r5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x1b5g5r5 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a4r4g4b4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x4r4g4b4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a4b4g4r4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_x4b4g4r4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetcha_a8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_r3g3b2 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_b2g3r3 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a2r2g2b2 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a2b2g2r2 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_c8 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetcha_a4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_r1g2b1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_b1g2r1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a1r1g1b1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a1b1g1r1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_c4 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_a1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetcha_a1 (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_g1 (IcCompositeOperand *op);
void
-IcStore_a8r8g8b8 (IcCompositeOperand *op, CARD32 value);
+IcStore_a8r8g8b8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x8r8g8b8 (IcCompositeOperand *op, CARD32 value);
+IcStore_x8r8g8b8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a8b8g8r8 (IcCompositeOperand *op, CARD32 value);
+IcStore_a8b8g8r8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x8b8g8r8 (IcCompositeOperand *op, CARD32 value);
+IcStore_x8b8g8r8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_r8g8b8 (IcCompositeOperand *op, CARD32 value);
+IcStore_r8g8b8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_b8g8r8 (IcCompositeOperand *op, CARD32 value);
+IcStore_b8g8r8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_r5g6b5 (IcCompositeOperand *op, CARD32 value);
+IcStore_r5g6b5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_b5g6r5 (IcCompositeOperand *op, CARD32 value);
+IcStore_b5g6r5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a1r5g5b5 (IcCompositeOperand *op, CARD32 value);
+IcStore_a1r5g5b5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x1r5g5b5 (IcCompositeOperand *op, CARD32 value);
+IcStore_x1r5g5b5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a1b5g5r5 (IcCompositeOperand *op, CARD32 value);
+IcStore_a1b5g5r5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x1b5g5r5 (IcCompositeOperand *op, CARD32 value);
+IcStore_x1b5g5r5 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a4r4g4b4 (IcCompositeOperand *op, CARD32 value);
+IcStore_a4r4g4b4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x4r4g4b4 (IcCompositeOperand *op, CARD32 value);
+IcStore_x4r4g4b4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a4b4g4r4 (IcCompositeOperand *op, CARD32 value);
+IcStore_a4b4g4r4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_x4b4g4r4 (IcCompositeOperand *op, CARD32 value);
+IcStore_x4b4g4r4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a8 (IcCompositeOperand *op, CARD32 value);
+IcStore_a8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_r3g3b2 (IcCompositeOperand *op, CARD32 value);
+IcStore_r3g3b2 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_b2g3r3 (IcCompositeOperand *op, CARD32 value);
+IcStore_b2g3r3 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a2r2g2b2 (IcCompositeOperand *op, CARD32 value);
+IcStore_a2r2g2b2 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_c8 (IcCompositeOperand *op, CARD32 value);
+IcStore_c8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_g8 (IcCompositeOperand *op, CARD32 value);
+IcStore_g8 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a4 (IcCompositeOperand *op, CARD32 value);
+IcStore_a4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_r1g2b1 (IcCompositeOperand *op, CARD32 value);
+IcStore_r1g2b1 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_b1g2r1 (IcCompositeOperand *op, CARD32 value);
+IcStore_b1g2r1 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a1r1g1b1 (IcCompositeOperand *op, CARD32 value);
+IcStore_a1r1g1b1 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a1b1g1r1 (IcCompositeOperand *op, CARD32 value);
+IcStore_a1b1g1r1 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_c4 (IcCompositeOperand *op, CARD32 value);
+IcStore_c4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_g4 (IcCompositeOperand *op, CARD32 value);
+IcStore_g4 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_a1 (IcCompositeOperand *op, CARD32 value);
+IcStore_a1 (IcCompositeOperand *op, uint32_t value);
void
-IcStore_g1 (IcCompositeOperand *op, CARD32 value);
+IcStore_g1 (IcCompositeOperand *op, uint32_t value);
-CARD32
+uint32_t
IcFetch_external (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetch_transform (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetcha_transform (IcCompositeOperand *op);
-CARD32
+uint32_t
IcFetcha_external (IcCompositeOperand *op);
void
-IcStore_external (IcCompositeOperand *op, CARD32 value);
+IcStore_external (IcCompositeOperand *op, uint32_t value);
/*
Bool
IcBuildOneCompositeOperand (PicturePtr pPict,
IcCompositeOperand *op,
- INT16 x,
- INT16 y);
+ int16_t x,
+ int16_t y);
*/
Bool
IcBuildCompositeOperand (IcImage *image,
IcCompositeOperand op[4],
- INT16 x,
- INT16 y,
+ int16_t x,
+ int16_t y,
Bool transform,
Bool alpha);
void
-IcCompositeGeneral (CARD8 op,
+IcCompositeGeneral (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
/* icimage.c */
-CARD32
-IcOver (CARD32 x, CARD32 y);
+uint32_t
+IcOver (uint32_t x, uint32_t y);
-CARD32
-IcOver24 (CARD32 x, CARD32 y);
+uint32_t
+IcOver24 (uint32_t x, uint32_t y);
-CARD32
-IcIn (CARD32 x, CARD8 y);
+uint32_t
+IcIn (uint32_t x, uint8_t y);
void
-IcCompositeSolidMask_nx8x8888 (CARD8 op,
+IcCompositeSolidMask_nx8x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSolidMask_nx8x0888 (CARD8 op,
+IcCompositeSolidMask_nx8x0888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSolidMask_nx8888x8888C (CARD8 op,
+IcCompositeSolidMask_nx8888x8888C (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSolidMask_nx8x0565 (CARD8 op,
+IcCompositeSolidMask_nx8x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSolidMask_nx8888x0565C (CARD8 op,
+IcCompositeSolidMask_nx8888x0565C (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrc_8888x8888 (CARD8 op,
+IcCompositeSrc_8888x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrc_8888x0888 (CARD8 op,
+IcCompositeSrc_8888x0888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrc_8888x0565 (CARD8 op,
+IcCompositeSrc_8888x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrc_0565x0565 (CARD8 op,
+IcCompositeSrc_0565x0565 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrcAdd_8000x8000 (CARD8 op,
+IcCompositeSrcAdd_8000x8000 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrcAdd_8888x8888 (CARD8 op,
+IcCompositeSrcAdd_8888x8888 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSrcAdd_1000x1000 (CARD8 op,
+IcCompositeSrcAdd_1000x1000 (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
void
-IcCompositeSolidMask_nx1xn (CARD8 op,
+IcCompositeSolidMask_nx1xn (uint8_t op,
IcImage *iSrc,
IcImage *iMask,
IcImage *iDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height);
+ int16_t xSrc,
+ int16_t ySrc,
+ int16_t xMask,
+ int16_t yMask,
+ int16_t xDst,
+ int16_t yDst,
+ uint16_t width,
+ uint16_t height);
#endif /* _IC_MIPICT_H_ */
Index: icint.h
===================================================================
RCS file: /local/src/CVS/libic/src/icint.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- icint.h 15 May 2003 01:09:10 -0000 1.10
+++ icint.h 29 Jul 2003 21:45:20 -0000 1.11
@@ -21,8 +21,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _ICINT_H_
-#define _ICINT_H_
+#ifndef ICINT_H_INCLUDED
+#define ICINT_H_INCLUDED
#include "ic.h"
@@ -180,7 +180,7 @@
#define IcPatternOffset(o,t) ((o) ^ (IcPatternOffsetBits & ~(sizeof (t) - 1)))
-#define IcPtrOffset(p,o,t) ((t *) ((CARD8 *) (p) + (o)))
+#define IcPtrOffset(p,o,t) ((t *) ((uint8_t *) (p) + (o)))
#define IcSelectPatternPart(xor,o,t) ((xor) >> (IcPatternOffset (o,t) << 3))
#define IcStorePart(dst,off,t,xor) (*IcPtrOffset(dst,off,t) = \
IcSelectPart(xor,off,t))
@@ -231,110 +231,110 @@
#if IC_SHIFT == 6
#define IcDoLeftMaskByteRRop6Cases(dst,xor) \
case (sizeof (IcBits) - 7) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 7) | (2 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 7) | (3 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 7) | (4 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 7) | (5 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 7) | (6 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 7): \
- IcStorePart(dst,sizeof (IcBits) - 7,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD32,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 7,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint32_t,xor); \
break; \
case (sizeof (IcBits) - 6) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 6) | (2 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 6) | (3 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 6) | (4 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 6) | (5 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 6): \
- IcStorePart(dst,sizeof (IcBits) - 6,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD32,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 6,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint32_t,xor); \
break; \
case (sizeof (IcBits) - 5) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 5,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 5,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 5) | (2 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 5,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 5,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 5) | (3 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 5,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 5,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 5) | (4 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 5,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 5,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 5): \
- IcStorePart(dst,sizeof (IcBits) - 5,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD32,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 5,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint32_t,xor); \
break; \
case (sizeof (IcBits) - 4) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 4) | (2 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
break; \
case (sizeof (IcBits) - 4) | (3 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD16,xor); \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint16_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 4): \
- IcStorePart(dst,sizeof (IcBits) - 4,CARD32,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 4,uint32_t,xor); \
break;
#define IcDoRightMaskByteRRop6Cases(dst,xor) \
case 4: \
- IcStorePart(dst,0,CARD32,xor); \
+ IcStorePart(dst,0,uint32_t,xor); \
break; \
case 5: \
- IcStorePart(dst,0,CARD32,xor); \
- IcStorePart(dst,4,CARD8,xor); \
+ IcStorePart(dst,0,uint32_t,xor); \
+ IcStorePart(dst,4,uint8_t,xor); \
break; \
case 6: \
- IcStorePart(dst,0,CARD32,xor); \
- IcStorePart(dst,4,CARD16,xor); \
+ IcStorePart(dst,0,uint32_t,xor); \
+ IcStorePart(dst,4,uint16_t,xor); \
break; \
case 7: \
- IcStorePart(dst,0,CARD32,xor); \
- IcStorePart(dst,4,CARD16,xor); \
- IcStorePart(dst,6,CARD8,xor); \
+ IcStorePart(dst,0,uint32_t,xor); \
+ IcStorePart(dst,4,uint16_t,xor); \
+ IcStorePart(dst,6,uint8_t,xor); \
break;
#else
#define IcDoLeftMaskByteRRop6Cases(dst,xor)
@@ -345,22 +345,22 @@
switch (lb) { \
IcDoLeftMaskByteRRop6Cases(dst,xor) \
case (sizeof (IcBits) - 3) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 3,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 3,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 3) | (2 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 3,CARD8,xor); \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 3,uint8_t,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case (sizeof (IcBits) - 2) | (1 << (IC_SHIFT - 3)): \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint8_t,xor); \
break; \
case sizeof (IcBits) - 3: \
- IcStorePart(dst,sizeof (IcBits) - 3,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 3,uint8_t,xor); \
case sizeof (IcBits) - 2: \
- IcStorePart(dst,sizeof (IcBits) - 2,CARD16,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 2,uint16_t,xor); \
break; \
case sizeof (IcBits) - 1: \
- IcStorePart(dst,sizeof (IcBits) - 1,CARD8,xor); \
+ IcStorePart(dst,sizeof (IcBits) - 1,uint8_t,xor); \
break; \
default: \
*dst = IcDoMaskRRop(*dst, and, xor, l); \
@@ -372,14 +372,14 @@
#define IcDoRightMaskByteRRop(dst,rb,r,and,xor) { \
switch (rb) { \
case 1: \
- IcStorePart(dst,0,CARD8,xor); \
+ IcStorePart(dst,0,uint8_t,xor); \
break; \
case 2: \
- IcStorePart(dst,0,CARD16,xor); \
+ IcStorePart(dst,0,uint16_t,xor); \
break; \
case 3: \
- IcStorePart(dst,0,CARD16,xor); \
- IcStorePart(dst,2,CARD8,xor); \
+ IcStorePart(dst,0,uint16_t,xor); \
+ IcStorePart(dst,2,uint8_t,xor); \
break; \
IcDoRightMaskByteRRop6Cases(dst,xor) \
default: \
@@ -416,15 +416,15 @@
*/
#define IcLaneCase1(n,a,o) ((n) == 0x01 ? \
- (*(CARD8 *) ((a)+IcPatternOffset(o,CARD8)) = \
+ (*(uint8_t *) ((a)+IcPatternOffset(o,uint8_t)) = \
fgxor) : 0)
#define IcLaneCase2(n,a,o) ((n) == 0x03 ? \
- (*(CARD16 *) ((a)+IcPatternOffset(o,CARD16)) = \
+ (*(uint16_t *) ((a)+IcPatternOffset(o,uint16_t)) = \
fgxor) : \
((void)IcLaneCase1((n)&1,a,o), \
IcLaneCase1((n)>>1,a,(o)+1)))
#define IcLaneCase4(n,a,o) ((n) == 0x0f ? \
- (*(CARD32 *) ((a)+IcPatternOffset(o,CARD32)) = \
+ (*(uint32_t *) ((a)+IcPatternOffset(o,uint32_t)) = \
fgxor) : \
((void)IcLaneCase2((n)&3,a,o), \
IcLaneCase2((n)>>2,a,(o)+2)))
@@ -433,11 +433,11 @@
IcLaneCase4((n)>>4,a,(o)+4)))
#if IC_SHIFT == 6
-#define IcLaneCase(n,a) IcLaneCase8(n,(CARD8 *) (a),0)
+#define IcLaneCase(n,a) IcLaneCase8(n,(uint8_t *) (a),0)
#endif
#if IC_SHIFT == 5
-#define IcLaneCase(n,a) IcLaneCase4(n,(CARD8 *) (a),0)
+#define IcLaneCase(n,a) IcLaneCase4(n,(uint8_t *) (a),0)
#endif
/* Rotate a filled pixel value to the specified alignement */
@@ -710,7 +710,7 @@
} IcPixels;
/* XXX: This is to avoid including colormap.h from the server includes */
-typedef CARD32 Pixel;
+typedef uint32_t Pixel;
/* icutil.c */
IcBits
@@ -929,9 +929,9 @@
# endif
#endif
-typedef CARD32 xFixed_1_31;
-typedef CARD32 xFixed_1_16;
-typedef INT32 xFixed_16_16;
+typedef uint32_t xFixed_1_31;
+typedef uint32_t xFixed_1_16;
+typedef int32_t xFixed_16_16;
/*
* An unadorned "xFixed" is the same as xFixed_16_16,
@@ -975,4 +975,4 @@
#endif /* _PICTURE_H_ */
-#endif
+#endif /* ICINT_H_INCLUDED */
More information about the Commit
mailing list