[cairo-commit] libpixman/src iccompose.c,1.11,1.12

[Dave Beckett]

Committed by: dajobe

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

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


Index: iccompose.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccompose.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** iccompose.c	29 Oct 2003 18:45:02 -0000	1.11
--- iccompose.c	10 Dec 2003 22:20:31 -0000	1.12
***************
*** 37,42 ****
  
  static uint32_t
! IcCombineMaskU (IcCompositeOperand   *src,
! 		IcCompositeOperand   *msk)
  {
      uint32_t  x;
--- 37,42 ----
  
  static uint32_t
! IcCombineMaskU (pixman_compositeOperand   *src,
[...2441 lines suppressed...]
  		    int16_t	ySrc,
***************
*** 2641,2648 ****
  		    uint16_t	height)
  {
!     IcCompositeOperand	src[4],msk[4],dst[4],*pmsk;
!     IcCompositeOperand	*srcPict, *srcAlpha;
!     IcCompositeOperand	*dstPict, *dstAlpha;
!     IcCompositeOperand	*mskPict = 0, *mskAlpha = 0;
      IcCombineFunc	f;
      int			w;
--- 2641,2648 ----
  		    uint16_t	height)
  {
!     pixman_compositeOperand	src[4],msk[4],dst[4],*pmsk;
!     pixman_compositeOperand	*srcPict, *srcAlpha;
!     pixman_compositeOperand	*dstPict, *dstAlpha;
!     pixman_compositeOperand	*mskPict = 0, *mskAlpha = 0;
      IcCombineFunc	f;
      int			w;