[cairo-commit] libpixman/src icrop.h,1.5,1.6

[Dave Beckett]

Committed by: dajobe

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

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


Index: icrop.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icrop.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** icrop.h	17 Nov 2003 15:43:07 -0000	1.5
--- icrop.h	10 Dec 2003 22:21:16 -0000	1.6
***************
*** 27,37 ****
  
  typedef struct _mergeRopBits {
!     IcBits   ca1, cx1, ca2, cx2;
  } IcMergeRopRec, *IcMergeRopPtr;
  
  extern const IcMergeRopRec IcMergeRopBits[16] __internal_linkage;
  
! #define IcDeclareMergeRop() IcBits   _ca1, _cx1, _ca2, _cx2;
! #define IcDeclarePrebuiltMergeRop()	IcBits	_cca, _ccx;
  
  #define IcInitializeMergeRop(alu,pm) {\
--- 27,37 ----
  
  typedef struct _mergeRopBits {
!     pixman_bits_t   ca1, cx1, ca2, cx2;
  } IcMergeRopRec, *IcMergeRopPtr;
  
  extern const IcMergeRopRec IcMergeRopBits[16] __internal_linkage;
  
! #define IcDeclareMergeRop() pixman_bits_t   _ca1, _cx1, _ca2, _cx2;
! #define IcDeclarePrebuiltMergeRop()	pixman_bits_t	_cca, _ccx;
  
  #define IcInitializeMergeRop(alu,pm) {\
***************
*** 60,69 ****
  
  #define IcDoLeftMaskByteMergeRop(dst, src, lb, l) { \
!     IcBits  __xor = ((src) & _ca2) ^ _cx2; \
      IcDoLeftMaskByteRRop(dst,lb,l,((src) & _ca1) ^ _cx1,__xor); \
  }
  
  #define IcDoRightMaskByteMergeRop(dst, src, rb, r) { \
!     IcBits  __xor = ((src) & _ca2) ^ _cx2; \
      IcDoRightMaskByteRRop(dst,rb,r,((src) & _ca1) ^ _cx1,__xor); \
  }
--- 60,69 ----
  
  #define IcDoLeftMaskByteMergeRop(dst, src, lb, l) { \
!     pixman_bits_t  __xor = ((src) & _ca2) ^ _cx2; \
      IcDoLeftMaskByteRRop(dst,lb,l,((src) & _ca1) ^ _cx1,__xor); \
  }
  
  #define IcDoRightMaskByteMergeRop(dst, src, rb, r) { \
!     pixman_bits_t  __xor = ((src) & _ca2) ^ _cx2; \
      IcDoRightMaskByteRRop(dst,rb,r,((src) & _ca1) ^ _cx1,__xor); \
  }
***************
*** 86,92 ****
  			     ~(pm))
  
! #define IcXor(rop,fg,pm)	IcXorT(rop,fg,pm,IcBits)
  
! #define IcAnd(rop,fg,pm)	IcAndT(rop,fg,pm,IcBits)
  
  #define IcXorStip(rop,fg,pm)    IcXorT(rop,fg,pm,IcStip)
--- 86,92 ----
  			     ~(pm))
  
! #define IcXor(rop,fg,pm)	IcXorT(rop,fg,pm,pixman_bits_t)
  
! #define IcAnd(rop,fg,pm)	IcAndT(rop,fg,pm,pixman_bits_t)
  
  #define IcXorStip(rop,fg,pm)    IcXorT(rop,fg,pm,IcStip)
***************
*** 99,107 ****
  
  /* half of table */
! extern const IcBits icStipple16Bits[256] __internal_linkage;
  #define IcStipple16Bits(b) \
      (icStipple16Bits[(b)&0xff] | icStipple16Bits[(b) >> 8] << IC_HALFUNIT)
  
! extern const IcBits * __internal_linkage
  IcStippleTable(int bits);
  
--- 99,107 ----
  
  /* half of table */
! extern const pixman_bits_t icStipple16Bits[256] __internal_linkage;
  #define IcStipple16Bits(b) \
      (icStipple16Bits[(b)&0xff] | icStipple16Bits[(b) >> 8] << IC_HALFUNIT)
  
! extern const pixman_bits_t * __internal_linkage
  IcStippleTable(int bits);
  
***************
*** 113,122 ****
  						       
  #define IcDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \
!     IcBits  __xor = ((fx) & (b)) | ((bx) & ~(b)); \
      IcDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
  }
  
  #define IcDoRightMaskByteStippleRRop(dst, b, fa, fx, ba, bx, rb, r) { \
!     IcBits  __xor = ((fx) & (b)) | ((bx) & ~(b)); \
      IcDoRightMaskByteRRop(dst, rb, r, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
  }
--- 113,122 ----
  						       
  #define IcDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \
!     pixman_bits_t  __xor = ((fx) & (b)) | ((bx) & ~(b)); \
      IcDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
  }
  
  #define IcDoRightMaskByteStippleRRop(dst, b, fa, fx, ba, bx, rb, r) { \
!     pixman_bits_t  __xor = ((fx) & (b)) | ((bx) & ~(b)); \
      IcDoRightMaskByteRRop(dst, rb, r, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
  }