[cairo-commit] libpixman/src icbltone.c,1.5,1.6

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv9014

Modified Files:
	icbltone.c 
Log Message:
Rename exported Ic* and PixRegion* functions, types, enums
to be prefixed pixman (or PIXMAN for enum values)


Index: icbltone.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icbltone.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** icbltone.c	29 Oct 2003 18:45:02 -0000	1.5
--- icbltone.c	10 Dec 2003 22:20:18 -0000	1.6
***************
*** 139,144 ****
  	  IcStride  srcStride,	    /* IcStip units per scanline */
  	  int	    srcX,	    /* bit position of source */
! 	  IcBits    *dst,
! 	  IcStride  dstStride,	    /* IcBits units per scanline */
  	  int	    dstX,	    /* bit position of dest */
  	  int	    dstBpp,	    /* bits per destination unit */
--- 139,144 ----
  	  IcStride  srcStride,	    /* IcStip units per scanline */
  	  int	    srcX,	    /* bit position of source */
! 	  pixman_bits_t    *dst,
! 	  IcStride  dstStride,	    /* pixman_bits_t units per scanline */
  	  int	    dstX,	    /* bit position of dest */
  	  int	    dstBpp,	    /* bits per destination unit */
***************
*** 147,163 ****
  	  int	    height,	    /* height in scanlines */
  
! 	  IcBits    fgand,	    /* rrop values */
! 	  IcBits    fgxor,
! 	  IcBits    bgand,
! 	  IcBits    bgxor)
  {
!     const IcBits    *icbits;
!     int		    pixelsPerDst;		/* dst pixels per IcBits */
      int		    unitsPerSrc;		/* src patterns per IcStip */
      int		    leftShift, rightShift;	/* align source with dest */
!     IcBits	    startmask, endmask;		/* dest scanline masks */
      IcStip	    bits=0, bitsLeft, bitsRight;/* source bits */
      IcStip	    left;
!     IcBits	    mask;
      int		    nDst;			/* dest longwords (w.o. end) */
      int		    w;
--- 147,163 ----
  	  int	    height,	    /* height in scanlines */
  
! 	  pixman_bits_t    fgand,	    /* rrop values */
! 	  pixman_bits_t    fgxor,
! 	  pixman_bits_t    bgand,
! 	  pixman_bits_t    bgxor)
  {
!     const pixman_bits_t    *icbits;
!     int		    pixelsPerDst;		/* dst pixels per pixman_bits_t */
      int		    unitsPerSrc;		/* src patterns per IcStip */
      int		    leftShift, rightShift;	/* align source with dest */
!     pixman_bits_t	    startmask, endmask;		/* dest scanline masks */
      IcStip	    bits=0, bitsLeft, bitsRight;/* source bits */
      IcStip	    left;
!     pixman_bits_t	    mask;
      int		    nDst;			/* dest longwords (w.o. end) */
      int		    w;
***************
*** 185,189 ****
      
      /*
!      * Number of destination units in IcBits == number of stipple pixels
       * used each time
       */
--- 185,189 ----
      
      /*
!      * Number of destination units in pixman_bits_t == number of stipple pixels
       * used each time
       */
***************
*** 203,207 ****
  
      /*
!      * Adjust source and dest to nearest IcBits boundary
       */
      src += srcX >> IC_STIP_SHIFT;
--- 203,207 ----
  
      /*
!      * Adjust source and dest to nearest pixman_bits_t boundary
       */
      src += srcX >> IC_STIP_SHIFT;
***************
*** 456,460 ****
  #define IcStip24Len	    4
  
! static const IcBits icStipple24Bits[3][1 << IcStip24Len] = {
      /* rotate 0 */
      {
--- 456,460 ----
  #define IcStip24Len	    4
  
! static const pixman_bits_t icStipple24Bits[3][1 << IcStip24Len] = {
      /* rotate 0 */
      {
***************
*** 494,498 ****
  #endif
  
! static const IcBits icStipple24Bits[3][1 << IcStip24Len] = {
      /* rotate 0 */
      {
--- 494,498 ----
  #endif
  
! static const pixman_bits_t icStipple24Bits[3][1 << IcStip24Len] = {
      /* rotate 0 */
      {
***************
*** 572,577 ****
  	    IcStride	srcStride,  /* IcStip units per scanline */
  	    int		srcX,	    /* bit position of source */
! 	    IcBits	*dst,
! 	    IcStride	dstStride,  /* IcBits units per scanline */
  	    int		dstX,	    /* bit position of dest */
  	    int		dstBpp,	    /* bits per destination unit */
--- 572,577 ----
  	    IcStride	srcStride,  /* IcStip units per scanline */
  	    int		srcX,	    /* bit position of source */
! 	    pixman_bits_t	*dst,
! 	    IcStride	dstStride,  /* pixman_bits_t units per scanline */
  	    int		dstX,	    /* bit position of dest */
  	    int		dstBpp,	    /* bits per destination unit */
***************
*** 580,590 ****
  	    int		height,	    /* height in scanlines */
  
! 	    IcBits	fgand,	    /* rrop values */
! 	    IcBits	fgxor,
! 	    IcBits	bgand,
! 	    IcBits	bgxor)
  {
      IcStip	*src;
!     IcBits	leftMask, rightMask, mask;
      int		nlMiddle, nl;
      IcStip	stip, bits;
--- 580,590 ----
  	    int		height,	    /* height in scanlines */
  
! 	    pixman_bits_t	fgand,	    /* rrop values */
! 	    pixman_bits_t	fgxor,
! 	    pixman_bits_t	bgand,
! 	    pixman_bits_t	bgxor)
  {
      IcStip	*src;
!     pixman_bits_t	leftMask, rightMask, mask;
      int		nlMiddle, nl;
      IcStip	stip, bits;