[cairo-commit] libpixman/src icblt.c,1.3,1.4
Dave Beckett
commit at pdx.freedesktop.org
Wed Dec 10 14:20:13 PST 2003
Committed by: dajobe
Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv8994
Modified Files:
icblt.c
Log Message:
Rename exported Ic* and PixRegion* functions, types, enums
to be prefixed pixman (or PIXMAN for enum values)
Index: icblt.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icblt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** icblt.c 29 Oct 2003 18:45:02 -0000 1.3
--- icblt.c 10 Dec 2003 22:20:11 -0000 1.4
***************
*** 38,46 ****
void
! IcBlt (IcBits *srcLine,
IcStride srcStride,
int srcX,
! IcBits *dstLine,
IcStride dstStride,
int dstX,
--- 38,46 ----
void
! IcBlt (pixman_bits_t *srcLine,
IcStride srcStride,
int srcX,
! pixman_bits_t *dstLine,
IcStride dstStride,
int dstX,
***************
*** 50,54 ****
int alu,
! IcBits pm,
int bpp,
--- 50,54 ----
int alu,
! pixman_bits_t pm,
int bpp,
***************
*** 56,63 ****
int upsidedown)
{
! IcBits *src, *dst;
int leftShift, rightShift;
! IcBits startmask, endmask;
! IcBits bits, bits1;
int n, nmiddle;
int destInvarient;
--- 56,63 ----
int upsidedown)
{
! pixman_bits_t *src, *dst;
int leftShift, rightShift;
! pixman_bits_t startmask, endmask;
! pixman_bits_t bits, bits1;
int n, nmiddle;
int destInvarient;
***************
*** 155,159 ****
if (_ca2 + 1 == 0 && _cx2 == 0)
{
! IcBits t1, t2, t3, t4;
while (n >= 4)
{
--- 155,159 ----
if (_ca2 + 1 == 0 && _cx2 == 0)
{
! pixman_bits_t t1, t2, t3, t4;
while (n >= 4)
{
***************
*** 327,334 ****
static void
! IcBlt24Line (IcBits *src,
int srcX,
! IcBits *dst,
int dstX,
--- 327,334 ----
static void
! IcBlt24Line (pixman_bits_t *src,
int srcX,
! pixman_bits_t *dst,
int dstX,
***************
*** 336,340 ****
int alu,
! IcBits pm,
int reverse)
--- 336,340 ----
int alu,
! pixman_bits_t pm,
int reverse)
***************
*** 342,346 ****
#ifdef DEBUG_BLT24
char *origDst = (char *) dst;
! IcBits *origLine = dst + ((dstX >> IC_SHIFT) - 1);
int origNlw = ((width + IC_MASK) >> IC_SHIFT) + 3;
int origX = dstX / 24;
--- 342,346 ----
#ifdef DEBUG_BLT24
char *origDst = (char *) dst;
! pixman_bits_t *origLine = dst + ((dstX >> IC_SHIFT) - 1);
int origNlw = ((width + IC_MASK) >> IC_SHIFT) + 3;
int origX = dstX / 24;
***************
*** 348,356 ****
int leftShift, rightShift;
! IcBits startmask, endmask;
int n;
! IcBits bits, bits1;
! IcBits mask;
int rot;
--- 348,356 ----
int leftShift, rightShift;
! pixman_bits_t startmask, endmask;
int n;
! pixman_bits_t bits, bits1;
! pixman_bits_t mask;
int rot;
***************
*** 541,549 ****
void
! IcBlt24 (IcBits *srcLine,
IcStride srcStride,
int srcX,
! IcBits *dstLine,
IcStride dstStride,
int dstX,
--- 541,549 ----
void
! IcBlt24 (pixman_bits_t *srcLine,
IcStride srcStride,
int srcX,
! pixman_bits_t *dstLine,
IcStride dstStride,
int dstX,
***************
*** 553,557 ****
int alu,
! IcBits pm,
int reverse,
--- 553,557 ----
int alu,
! pixman_bits_t pm,
int reverse,
***************
*** 585,589 ****
void
! IcBltOdd (IcBits *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
--- 585,589 ----
void
! IcBltOdd (pixman_bits_t *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
***************
*** 591,595 ****
int srcXOdd,
! IcBits *dstLine,
IcStride dstStrideEven,
IcStride dstStrideOdd,
--- 591,595 ----
int srcXOdd,
! pixman_bits_t *dstLine,
IcStride dstStrideEven,
IcStride dstStrideOdd,
***************
*** 601,624 ****
int alu,
! IcBits pm,
int bpp)
{
! IcBits *src;
int leftShiftEven, rightShiftEven;
! IcBits startmaskEven, endmaskEven;
int nmiddleEven;
! IcBits *dst;
int leftShiftOdd, rightShiftOdd;
! IcBits startmaskOdd, endmaskOdd;
int nmiddleOdd;
int leftShift, rightShift;
! IcBits startmask, endmask;
int nmiddle;
int srcX, dstX;
! IcBits bits, bits1;
int n;
--- 601,624 ----
int alu,
! pixman_bits_t pm,
int bpp)
{
! pixman_bits_t *src;
int leftShiftEven, rightShiftEven;
! pixman_bits_t startmaskEven, endmaskEven;
int nmiddleEven;
! pixman_bits_t *dst;
int leftShiftOdd, rightShiftOdd;
! pixman_bits_t startmaskOdd, endmaskOdd;
int nmiddleOdd;
int leftShift, rightShift;
! pixman_bits_t startmask, endmask;
int nmiddle;
int srcX, dstX;
! pixman_bits_t bits, bits1;
int n;
***************
*** 758,762 ****
#ifdef IC_24BIT
void
! IcBltOdd24 (IcBits *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
--- 758,762 ----
#ifdef IC_24BIT
void
! IcBltOdd24 (pixman_bits_t *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
***************
*** 764,768 ****
int srcXOdd,
! IcBits *dstLine,
IcStride dstStrideEven,
IcStride dstStrideOdd,
--- 764,768 ----
int srcXOdd,
! pixman_bits_t *dstLine,
IcStride dstStrideEven,
IcStride dstStrideOdd,
***************
*** 774,778 ****
int alu,
! IcBits pm)
{
int even = 1;
--- 774,778 ----
int alu,
! pixman_bits_t pm)
{
int even = 1;
***************
*** 810,814 ****
IcStride stipStride,
int srcX,
! IcBits **bits,
IcStride *strideEven,
IcStride *strideOdd,
--- 810,814 ----
IcStride stipStride,
int srcX,
! pixman_bits_t **bits,
IcStride *strideEven,
IcStride *strideOdd,
***************
*** 828,832 ****
strideAdjust = stipStride & (IC_MASK >> IC_STIP_SHIFT);
! *bits = (IcBits *) ((char *) stip - srcAdjust);
if (srcAdjust)
{
--- 828,832 ----
strideAdjust = stipStride & (IC_MASK >> IC_STIP_SHIFT);
! *bits = (pixman_bits_t *) ((char *) stip - srcAdjust);
if (srcAdjust)
{
***************
*** 850,858 ****
void
IcBltStip (IcStip *src,
! IcStride srcStride, /* in IcStip units, not IcBits units */
int srcX,
IcStip *dst,
! IcStride dstStride, /* in IcStip units, not IcBits units */
int dstX,
--- 850,858 ----
void
IcBltStip (IcStip *src,
! IcStride srcStride, /* in IcStip units, not pixman_bits_t units */
int srcX,
IcStip *dst,
! IcStride dstStride, /* in IcStip units, not pixman_bits_t units */
int dstX,
***************
*** 861,865 ****
int alu,
! IcBits pm,
int bpp)
{
--- 861,865 ----
int alu,
! pixman_bits_t pm,
int bpp)
{
***************
*** 872,876 ****
int srcXEven, srcXOdd;
int dstXEven, dstXOdd;
! IcBits *s, *d;
int sx, dx;
--- 872,876 ----
int srcXEven, srcXOdd;
int dstXEven, dstXOdd;
! pixman_bits_t *s, *d;
int sx, dx;
***************
*** 916,922 ****
#endif
{
! IcBlt ((IcBits *) src, IcStipStrideToBitsStride (srcStride),
srcX,
! (IcBits *) dst, IcStipStrideToBitsStride (dstStride),
dstX,
width, height,
--- 916,922 ----
#endif
{
! IcBlt ((pixman_bits_t *) src, IcStipStrideToBitsStride (srcStride),
srcX,
! (pixman_bits_t *) dst, IcStipStrideToBitsStride (dstStride),
dstX,
width, height,
More information about the cairo-commit
mailing list