[cairo-commit] libpixman/src icpixels.c,1.4,1.5

[Dave Beckett]

Committed by: dajobe

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

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


Index: icpixels.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icpixels.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** icpixels.c	5 Sep 2003 22:24:45 -0000	1.4
--- icpixels.c	10 Dec 2003 22:21:04 -0000	1.5
***************
*** 26,36 ****
  
  static void
! IcPixelsInit (IcPixels *pixels, IcBits *buf, int width, int height, int depth, int bpp, int stride);
  
  static unsigned int
! IcBitsPerPixel (unsigned int depth);
  
  static unsigned int
! IcBitsPerPixel (unsigned int depth)
  {
      if (depth > 8)
--- 26,36 ----
  
  static void
! IcPixelsInit (IcPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride);
  
  static unsigned int
! pixman_bits_tPerPixel (unsigned int depth);
  
  static unsigned int
! pixman_bits_tPerPixel (unsigned int depth)
  {
      if (depth > 8)
***************
*** 52,56 ****
  {
      IcPixels		*pixels;
!     IcBits		*buf;
      unsigned int	buf_size;
      unsigned int	bpp;
--- 52,56 ----
  {
      IcPixels		*pixels;
!     pixman_bits_t		*buf;
      unsigned int	buf_size;
      unsigned int	bpp;
***************
*** 59,64 ****
      unsigned int	base;
  
!     bpp = IcBitsPerPixel (depth);
!     stride = ((width * bpp + IC_MASK) >> IC_SHIFT) * sizeof (IcBits);
      buf_size = height * stride;
      base = sizeof (IcPixels);
--- 59,64 ----
      unsigned int	base;
  
!     bpp = pixman_bits_tPerPixel (depth);
!     stride = ((width * bpp + IC_MASK) >> IC_SHIFT) * sizeof (pixman_bits_t);
      buf_size = height * stride;
      base = sizeof (IcPixels);
***************
*** 72,76 ****
  	return NULL;
  
!     buf = (IcBits *) ((char *)pixels + base + adjust);
  
      IcPixelsInit (pixels, buf, width, height, depth, bpp, stride);
--- 72,76 ----
  	return NULL;
  
!     buf = (pixman_bits_t *) ((char *)pixels + base + adjust);
  
      IcPixelsInit (pixels, buf, width, height, depth, bpp, stride);
***************
*** 80,84 ****
  
  IcPixels *
! IcPixelsCreateForData (IcBits *data, int width, int height, int depth, int bpp, int stride)
  {
      IcPixels *pixels;
--- 80,84 ----
  
  IcPixels *
! IcPixelsCreateForData (pixman_bits_t *data, int width, int height, int depth, int bpp, int stride)
  {
      IcPixels *pixels;
***************
*** 94,98 ****
  
  static void
! IcPixelsInit (IcPixels *pixels, IcBits *buf, int width, int height, int depth, int bpp, int stride)
  {
      pixels->data = buf;
--- 94,98 ----
  
  static void
! IcPixelsInit (IcPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride)
  {
      pixels->data = buf;