[cairo-commit] libpixman/src pixregionint.h,1.4,1.5

[Dave Beckett]

Committed by: dajobe

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

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


Index: pixregionint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixregionint.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pixregionint.h	10 Dec 2003 00:09:38 -0000	1.4
--- pixregionint.h	10 Dec 2003 22:22:09 -0000	1.5
***************
*** 52,83 ****
  #include "pixman.h"
  
! typedef struct _PixRegionData {
      long		size;
      long		numRects;
      /* XXX: And why, exactly, do we have this bogus struct definition? */
! /*  PixRegionBox	rects[size];   in memory but not explicitly declared */
! } PixRegionData;
  
! struct _PixRegion {
!     PixRegionBox	extents;
!     PixRegionData	*data;
  };
  
! typedef struct _PixRegionPoint {
      int x, y;
! } PixRegionPoint;
  
  #define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
  /* not a region */
! #define PIXREGION_NAR(reg)	((reg)->data == &PixRegionBrokenData)
  #define PIXREGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
  #define PIXREGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
! #define PIXREGION_RECTS(reg) ((reg)->data ? (PixRegionBox *)((reg)->data + 1) \
  			               : &(reg)->extents)
! #define PIXREGION_BOXPTR(reg) ((PixRegionBox *)((reg)->data + 1))
  #define PIXREGION_BOX(reg,i) (&PIXREGION_BOXPTR(reg)[i])
  #define PIXREGION_TOP(reg) PIXREGION_BOX(reg, (reg)->data->numRects)
  #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1)
! #define PIXREGION_SZOF(n) (sizeof(PixRegionData) + ((n) * sizeof(PixRegionBox)))
  
  #endif /* _PIXREGIONINT_H_ */
--- 52,83 ----
  #include "pixman.h"
  
! typedef struct _pixman_region16_tData {
      long		size;
      long		numRects;
      /* XXX: And why, exactly, do we have this bogus struct definition? */
! /*  pixman_box16_t	rects[size];   in memory but not explicitly declared */
! } pixman_region16_tData;
  
! struct _pixman_region16_t {
!     pixman_box16_t	extents;
!     pixman_region16_tData	*data;
  };
  
! typedef struct _pixman_region16_tPoint {
      int x, y;
! } pixman_region16_tPoint;
  
  #define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
  /* not a region */
! #define PIXREGION_NAR(reg)	((reg)->data == &pixman_region16_tBrokenData)
  #define PIXREGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
  #define PIXREGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
! #define PIXREGION_RECTS(reg) ((reg)->data ? (pixman_box16_t *)((reg)->data + 1) \
  			               : &(reg)->extents)
! #define PIXREGION_BOXPTR(reg) ((pixman_box16_t *)((reg)->data + 1))
  #define PIXREGION_BOX(reg,i) (&PIXREGION_BOXPTR(reg)[i])
  #define PIXREGION_TOP(reg) PIXREGION_BOX(reg, (reg)->data->numRects)
  #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1)
! #define PIXREGION_SZOF(n) (sizeof(pixman_region16_tData) + ((n) * sizeof(pixman_box16_t)))
  
  #endif /* _PIXREGIONINT_H_ */