[cairo-commit] libpixman/src icimage.h,1.15,1.16
Dave Beckett
commit at pdx.freedesktop.org
Wed Dec 10 14:20:52 PST 2003
Committed by: dajobe
Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv9088
Modified Files:
icimage.h
Log Message:
Rename exported Ic* and PixRegion* functions, types, enums
to be prefixed pixman (or PIXMAN for enum values)
Index: icimage.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** icimage.h 29 Oct 2003 18:54:26 -0000 1.15
--- icimage.h 10 Dec 2003 22:20:50 -0000 1.16
***************
*** 77,81 ****
/*
! typedef struct _IcFormat {
uint32_t id;
uint32_t format;
--- 77,81 ----
/*
! typedef struct _pixman_format_t {
uint32_t id;
uint32_t format;
***************
*** 84,93 ****
DirectFormatRec direct;
IndexFormatRec index;
! } IcFormatRec;
*/
! struct _IcImage {
IcPixels *pixels;
! IcFormat image_format;
int format_code;
int refcnt;
--- 84,93 ----
DirectFormatRec direct;
IndexFormatRec index;
! } pixman_format_tRec;
*/
! struct _pixman_image_t {
IcPixels *pixels;
! pixman_format_t image_format;
int format_code;
int refcnt;
***************
*** 104,108 ****
unsigned int unused : 23;
! struct _IcImage *alphaMap;
IcPoint alphaOrigin;
--- 104,108 ----
unsigned int unused : 23;
! struct _pixman_image_t *alphaMap;
IcPoint alphaOrigin;
***************
*** 115,124 ****
unsigned long serialNumber;
! PixRegion *pCompositeClip;
! IcTransform *transform;
! IcFilter filter;
! IcFixed16_16 *filter_params;
int filter_nparams;
--- 115,124 ----
unsigned long serialNumber;
! pixman_region16_t *pCompositeClip;
! pixman_transform_t *transform;
! pixman_filter_t filter;
! pixman_fixed16_16_t *filter_params;
int filter_nparams;
***************
*** 159,166 ****
extern void __internal_linkage
! IcImageInit (IcImage *image);
extern void __internal_linkage
! IcImageDestroyClip (IcImage *image);
/*
--- 159,166 ----
extern void __internal_linkage
! pixman_image_tInit (pixman_image_t *image);
extern void __internal_linkage
! pixman_image_tDestroyClip (pixman_image_t *image);
/*
***************
*** 173,178 ****
/* XXX: What should this be?
extern int __internal_linkage
! IcClipPicture (PixRegion *region,
! IcImage *image,
int16_t xReg,
int16_t yReg,
--- 173,178 ----
/* XXX: What should this be?
extern int __internal_linkage
! IcClipPicture (pixman_region16_t *region,
! pixman_image_t *image,
int16_t xReg,
int16_t yReg,
***************
*** 182,189 ****
extern int __internal_linkage
! IcComputeCompositeRegion (PixRegion *region,
! IcImage *iSrc,
! IcImage *iMask,
! IcImage *iDst,
int16_t xSrc,
int16_t ySrc,
--- 182,189 ----
extern int __internal_linkage
! IcComputeCompositeRegion (pixman_region16_t *region,
! pixman_image_t *iSrc,
! pixman_image_t *iMask,
! pixman_image_t *iDst,
int16_t xSrc,
int16_t ySrc,
***************
*** 202,206 ****
/*
extern void __internal_linkage
! IcGlyphs (IcOperator op,
PicturePtr pSrc,
PicturePtr pDst,
--- 202,206 ----
/*
extern void __internal_linkage
! IcGlyphs (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pDst,
***************
*** 215,219 ****
/*
extern void __internal_linkage
! IcCompositeRects (IcOperator op,
PicturePtr pDst,
xRenderColor *color,
--- 215,219 ----
/*
extern void __internal_linkage
! pixman_compositeRects (pixman_operator_t op,
PicturePtr pDst,
xRenderColor *color,
***************
*** 222,235 ****
*/
! extern IcImage * __internal_linkage
! IcCreateAlphaPicture (IcImage *dst,
! IcFormat *format,
uint16_t width,
uint16_t height);
! typedef void (*CompositeFunc) (IcOperator op,
! IcImage *iSrc,
! IcImage *iMask,
! IcImage *iDst,
int16_t xSrc,
int16_t ySrc,
--- 222,235 ----
*/
! extern pixman_image_t * __internal_linkage
! IcCreateAlphaPicture (pixman_image_t *dst,
! pixman_format_t *format,
uint16_t width,
uint16_t height);
! typedef void (*CompositeFunc) (pixman_operator_t op,
! pixman_image_t *iSrc,
! pixman_image_t *iMask,
! pixman_image_t *iDst,
int16_t xSrc,
int16_t ySrc,
***************
*** 241,260 ****
uint16_t height);
! typedef struct _IcCompositeOperand IcCompositeOperand;
! typedef uint32_t (*IcCompositeFetch)(IcCompositeOperand *op);
! typedef void (*IcCompositeStore) (IcCompositeOperand *op, uint32_t value);
! typedef void (*IcCompositeStep) (IcCompositeOperand *op);
! typedef void (*IcCompositeSet) (IcCompositeOperand *op, int x, int y);
! struct _IcCompositeOperand {
union {
struct {
! IcBits *top_line;
int left_offset;
int start_offset;
! IcBits *line;
uint32_t offset;
IcStride stride;
--- 241,260 ----
uint16_t height);
! typedef struct _pixman_compositeOperand pixman_compositeOperand;
! typedef uint32_t (*pixman_compositeFetch)(pixman_compositeOperand *op);
! typedef void (*pixman_compositeStore) (pixman_compositeOperand *op, uint32_t value);
! typedef void (*pixman_compositeStep) (pixman_compositeOperand *op);
! typedef void (*pixman_compositeSet) (pixman_compositeOperand *op, int x, int y);
! struct _pixman_compositeOperand {
union {
struct {
! pixman_bits_t *top_line;
int left_offset;
int start_offset;
! pixman_bits_t *line;
uint32_t offset;
IcStride stride;
***************
*** 271,299 ****
int x;
int y;
! IcTransform *transform;
! IcFilter filter;
} transform;
} u;
! IcCompositeFetch fetch;
! IcCompositeFetch fetcha;
! IcCompositeStore store;
! IcCompositeStep over;
! IcCompositeStep down;
! IcCompositeSet set;
/* XXX: We're not supporting indexed operations, right?
IcIndexedPtr indexed;
*/
! PixRegion *clip;
};
! typedef void (*IcCombineFunc) (IcCompositeOperand *src,
! IcCompositeOperand *msk,
! IcCompositeOperand *dst);
typedef struct _IcAccessMap {
uint32_t format_code;
! IcCompositeFetch fetch;
! IcCompositeFetch fetcha;
! IcCompositeStore store;
} IcAccessMap;
--- 271,299 ----
int x;
int y;
! pixman_transform_t *transform;
! pixman_filter_t filter;
} transform;
} u;
! pixman_compositeFetch fetch;
! pixman_compositeFetch fetcha;
! pixman_compositeStore store;
! pixman_compositeStep over;
! pixman_compositeStep down;
! pixman_compositeSet set;
/* XXX: We're not supporting indexed operations, right?
IcIndexedPtr indexed;
*/
! pixman_region16_t *clip;
};
! typedef void (*IcCombineFunc) (pixman_compositeOperand *src,
! pixman_compositeOperand *msk,
! pixman_compositeOperand *dst);
typedef struct _IcAccessMap {
uint32_t format_code;
! pixman_compositeFetch fetch;
! pixman_compositeFetch fetcha;
! pixman_compositeStore store;
} IcAccessMap;
***************
*** 306,311 ****
extern int __internal_linkage
! IcBuildCompositeOperand (IcImage *image,
! IcCompositeOperand op[4],
int16_t x,
int16_t y,
--- 306,311 ----
extern int __internal_linkage
! IcBuildCompositeOperand (pixman_image_t *image,
! pixman_compositeOperand op[4],
int16_t x,
int16_t y,
***************
*** 314,321 ****
extern void __internal_linkage
! IcCompositeGeneral (IcOperator op,
! IcImage *iSrc,
! IcImage *iMask,
! IcImage *iDst,
int16_t xSrc,
int16_t ySrc,
--- 314,321 ----
extern void __internal_linkage
! pixman_compositeGeneral (pixman_operator_t op,
! pixman_image_t *iSrc,
! pixman_image_t *iMask,
! pixman_image_t *iDst,
int16_t xSrc,
int16_t ySrc,
More information about the cairo-commit
mailing list