[cairo-commit] libpixman/src icutil.c,1.6,1.7

[Dave Beckett]

Committed by: dajobe

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

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


Index: icutil.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icutil.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** icutil.c	25 Nov 2003 15:45:34 -0000	1.6
--- icutil.c	10 Dec 2003 22:21:48 -0000	1.7
***************
*** 25,32 ****
  #include "icint.h"
  
! IcBits
  IcReplicatePixel (Pixel p, int bpp)
  {
!     IcBits  b = p;
      
      b &= IcFullMask (bpp);
--- 25,32 ----
  #include "icint.h"
  
! pixman_bits_t
  IcReplicatePixel (Pixel p, int bpp)
  {
!     pixman_bits_t  b = p;
      
      b &= IcFullMask (bpp);
***************
*** 100,111 ****
  #define icStipple16Bits 0
  #define icStipple8Bits 0
! static const IcBits icStipple4Bits[16] = {
      C4(  0,4), C4(  1,4), C4(  2,4), C4(  3,4), C4(  4,4), C4(  5,4),
      C4(  6,4), C4(  7,4), C4(  8,4), C4(  9,4), C4( 10,4), C4( 11,4),
      C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),};
! static const IcBits icStipple2Bits[4] = {
      C2(  0,8), C2(  1,8), C2(  2,8), C2(  3,8),
  };
! static const IcBits icStipple1Bits[2] = {
      C1(  0,16), C1(  1,16),
  };
--- 100,111 ----
  #define icStipple16Bits 0
  #define icStipple8Bits 0
! static const pixman_bits_t icStipple4Bits[16] = {
      C4(  0,4), C4(  1,4), C4(  2,4), C4(  3,4), C4(  4,4), C4(  5,4),
      C4(  6,4), C4(  7,4), C4(  8,4), C4(  9,4), C4( 10,4), C4( 11,4),
      C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),};
! static const pixman_bits_t icStipple2Bits[4] = {
      C2(  0,8), C2(  1,8), C2(  2,8), C2(  3,8),
  };
! static const pixman_bits_t icStipple1Bits[2] = {
      C1(  0,16), C1(  1,16),
  };
***************
*** 113,117 ****
  #if IC_UNIT == 32
  #define icStipple16Bits 0
! static const IcBits icStipple8Bits[256] = {
      C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
      C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
--- 113,117 ----
  #if IC_UNIT == 32
  #define icStipple16Bits 0
! static const pixman_bits_t icStipple8Bits[256] = {
      C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
      C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
***************
*** 158,174 ****
      C8(252,4), C8(253,4), C8(254,4), C8(255,4),
  };
! static const IcBits icStipple4Bits[16] = {
      C4(  0,8), C4(  1,8), C4(  2,8), C4(  3,8), C4(  4,8), C4(  5,8),
      C4(  6,8), C4(  7,8), C4(  8,8), C4(  9,8), C4( 10,8), C4( 11,8),
      C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),};
! static const IcBits icStipple2Bits[4] = {
      C2(  0,16), C2(  1,16), C2(  2,16), C2(  3,16),
  };
! static const IcBits icStipple1Bits[2] = {
      C1(  0,32), C1(  1,32),
  };
  #endif
  #if IC_UNIT == 64
! const IcBits icStipple16Bits[256] = {
      C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
      C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
--- 158,174 ----
      C8(252,4), C8(253,4), C8(254,4), C8(255,4),
  };
! static const pixman_bits_t icStipple4Bits[16] = {
      C4(  0,8), C4(  1,8), C4(  2,8), C4(  3,8), C4(  4,8), C4(  5,8),
      C4(  6,8), C4(  7,8), C4(  8,8), C4(  9,8), C4( 10,8), C4( 11,8),
      C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),};
! static const pixman_bits_t icStipple2Bits[4] = {
      C2(  0,16), C2(  1,16), C2(  2,16), C2(  3,16),
  };
! static const pixman_bits_t icStipple1Bits[2] = {
      C1(  0,32), C1(  1,32),
  };
  #endif
  #if IC_UNIT == 64
! const pixman_bits_t icStipple16Bits[256] = {
      C8(  0,4), C8(  1,4), C8(  2,4), C8(  3,4), C8(  4,4), C8(  5,4),
      C8(  6,4), C8(  7,4), C8(  8,4), C8(  9,4), C8( 10,4), C8( 11,4),
***************
*** 215,219 ****
      C8(252,4), C8(253,4), C8(254,4), C8(255,4),
  };
! static const IcBits icStipple8Bits[256] = {
      C8(  0,8), C8(  1,8), C8(  2,8), C8(  3,8), C8(  4,8), C8(  5,8),
      C8(  6,8), C8(  7,8), C8(  8,8), C8(  9,8), C8( 10,8), C8( 11,8),
--- 215,219 ----
      C8(252,4), C8(253,4), C8(254,4), C8(255,4),
  };
! static const pixman_bits_t icStipple8Bits[256] = {
      C8(  0,8), C8(  1,8), C8(  2,8), C8(  3,8), C8(  4,8), C8(  5,8),
      C8(  6,8), C8(  7,8), C8(  8,8), C8(  9,8), C8( 10,8), C8( 11,8),
***************
*** 260,268 ****
      C8(252,8), C8(253,8), C8(254,8), C8(255,8),
  };
! static const IcBits icStipple4Bits[16] = {
      C4(  0,16), C4(  1,16), C4(  2,16), C4(  3,16), C4(  4,16), C4(  5,16),
      C4(  6,16), C4(  7,16), C4(  8,16), C4(  9,16), C4( 10,16), C4( 11,16),
      C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),};
! static const IcBits icStipple2Bits[4] = {
      C2(  0,32), C2(  1,32), C2(  2,32), C2(  3,32),
  };
--- 260,268 ----
      C8(252,8), C8(253,8), C8(254,8), C8(255,8),
  };
! static const pixman_bits_t icStipple4Bits[16] = {
      C4(  0,16), C4(  1,16), C4(  2,16), C4(  3,16), C4(  4,16), C4(  5,16),
      C4(  6,16), C4(  7,16), C4(  8,16), C4(  9,16), C4( 10,16), C4( 11,16),
      C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),};
! static const pixman_bits_t icStipple2Bits[4] = {
      C2(  0,32), C2(  1,32), C2(  2,32), C2(  3,32),
  };
***************
*** 270,274 ****
  #endif
  
! const IcBits *
  IcStippleTable(int bits)
  {
--- 270,274 ----
  #endif
  
! const pixman_bits_t *
  IcStippleTable(int bits)
  {