[cairo-commit] cairoxx pixman,1.3,1.4 pixman.cc,1.2,1.3

[David Bellot]

Committed by: yimyom

Update of /cvs/cairo/cairoxx
In directory pdx:/tmp/cvs-serv29740

Modified Files:
	pixman pixman.cc 
Log Message:
Update and update. Towards C++ bindings for libpixman


Index: pixman
===================================================================
RCS file: /cvs/cairo/cairoxx/pixman,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** a/pixman	18 Apr 2004 03:04:00 -0000	1.3
--- b/pixman	5 May 2004 22:18:29 -0000	1.4
***************
*** 53,136 ****
  // ####################
  
- class AccessMap {
- 	public:
- 		
- 	private:
- };
- class CompositeFunc {
- 	public:
- 	private:
- };
- class CombineFunc {
- 	public:
- 	private:
- };
- 
- class CompSrc {
- 	public:
- 	private:
- };
- 
- class IndexType {
- 	public:
- 	private:
- };
- 
- class Pixels {
- 	public:
- 	private:
- };
- 
- class Point {
- 	public:
- 	private:
- };
- 
- class Stip {
- 	public:
- 	private:
- };
- 
- class Stride {
- 	public:
- 	private:
- };
- 
- class MergeRopPtr {
- 	public:
- 	private:
- };
- 
- class MergeRopRec {
- 	public:
- 	private:
- };
- 
- 
- class compositeFetch {
- 	public:
- 	private:
- };
- 
- class compositeOperand {
- 	public:
- 	private:
- };
- 
- class compositeSet {
- 	public:
- 	private:
- };
- 
- class compositeStep {
- 	public:
- 	private:
- };
- 
- class compositeStore {
- 	public:
- 	private:
- };
- 
  class box16 {
  	public:
--- 53,56 ----
***************
*** 141,154 ****
  };
  
- class color {
- 	public:
- 	private:
- };
- 
- class fixed16_16 {
- 	public:
- 	private:
- };
- 
  class format {
  	public:
--- 61,64 ----
***************
*** 163,171 ****
  };
  
- class format_tName {
- 	public:
- 	private:
- };
- 
  class image {
  	public:
--- 73,76 ----
***************
*** 195,213 ****
  };
  
- class line_fixed {
- 	public:
- 	private:
- };
- 
- class operator {
- 	public:
- 	private:
- };
- 
- class point_fixed {
- 	public:
- 	private:
- };
- 
  class region16 {
  	public:
--- 100,103 ----
***************
*** 238,324 ****
  		pixman_region16_t *obj;
  };
- 
- class region_status {
- 	public:
- 	private:
- };
- 
- class transform {
- 	public:
- 	private:
- };
- 
- class region16_tData {
- 	public:
- 	private:
- };
- 
- class region16_tPoint {
- 	public:
- 	private:
- };
- 
- }
- 
- class DirectFormatPtr {
- 	public:
- 	private:
- };
- 
- 
- class Mask {
- 	public:
- 	private:
- };
- 
- class PictFormatPtr {
- 	public:
- 	private:
- };
- 
- class PicturePtr {
- 	public:
- 	private:
- };
- 
- class Pixel {
- 	public:
- 	private:
- };
- 
- class xFixed {
- 	public:
- 	private:
- };
- 
- class xFixed_16_16 {
- 	public:
- 	private:
- };
- 
- class xFixed_1_16 {
- 	public:
- 	private:
- };
- 
- class xFixed_1_31 {
- 	public:
- 	private:
- };
- 
- class xFixed_32_32 {
- 	public:
- 	private:
- };
- 
- class xFixed_32_32 {
- 	public:
- 	private:
- };
- 
- class xFixed_32_32 {
- 	public:
- 	private:
- };
- 
- 
--- 128,129 ----

Index: pixman.cc
===================================================================
RCS file: /cvs/cairo/cairoxx/pixman.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** a/pixman.cc	11 Apr 2004 03:02:58 -0000	1.2
--- b/pixman.cc	5 May 2004 22:18:29 -0000	1.3
***************
*** 19,20 ****
--- 19,78 ----
  //
  // Author : David Bellot <bellot at stat.berkeley.edu, yimyom at users.sourceforge.net, bellot at inrialpes.fr>
+ 
+ namespace Pixman {
+ 
+ box16::box16()
+ box16::~box16()
+ 
+ format::		format(tName name){}
+ format::		format(int bpp, int alpha_mask, int red_mask, int green_mask, int blue_mask){}
+ format::		~format(){}
+ format::
+ format::		void color_to_pixel(const pixman_color_t	*color, pixman_bits_t		*pixel){}
+ format::		void pixel_to_color(pixman_bits_t		pixel, pixman_color_t		*color){}
+ 
+ image::		image(format& f, int width, int height){}
+ image::		image(pixman_bits_t *data, format& f,  int width, int height, int bpp, int stride){}
+ image::		~image(){}
+ 
+ image::		int set_clip_region(region16& region){}
+ image::		int set_transform(pixman_transform_t *transform){}
+ image::		void set_repeat(int repeat){}
+ image::		void set_filter(filter	f){}
+ image::		int get_width(){}
+ image::		int get_height(){}
+ image::		int get_stride(){}
+ image::		int get_depth(){}
+ image::		format get_format();	
+ image::		pixman_bits_t *get_data(){}
+ 
+ image::		void fill_rectangle(pixman_operator_t op,const pixman_color_t *color, int x, int y, unsigned int width, unsigned int height){}
+ image::		void fill_rectangles(pixman_operator_t op,const pixman_color_t *color, const pixman_rectangle_t	*rects, int nRects){}
+ image::		void composite_trapezoids(pixman_operator_t op, image& src, int	xSrc, int ySrc, const pixman_trapezoid_t *traps, int ntrap){}
+ image::		void composite_triangles(pixman_operator_t op , image& src, int	xSrc, int ySrc, const pixman_triangle_t	*tris, int ntris); 
+ image::		void composite_tri_strip(pixman_operator_t op , image& src, int	xSrc, int ySrc, const pixman_point_fixed_t *points, int npoints){}
+ image::		void composite_tri_fan(pixman_operator_t op   , image& src, int	xSrc, int ySrc, const pixman_point_fixed_t *points, int npoints){}
+ image::		void composite(pixman_operator_t op, image& iSrc, image& iMask, int xSrc, int ySrc, int xMask, int yMask, int xDst, int	yDst, int width, int height){}
+ 
+ region16::		region16(){}
+ region16::	region16(box16& extents){}
+ region16::		~region16(){}
+ 
+ region16::	void translate(int x, int y){}
+ region16::		status copy(region16& dest);	// XXX operator =
+ region16::		status intersect(region16& reg1, region16& reg2); //XXX operator &
+ region16::		status union(region16& reg1, region16& reg2); //XXX  operator | 
+ region16::		status union_rect(region16& src, int x, int y, unsigned int width, unsigned int height); 
+ region16::		status substract(region16& regM, region16& regS); //XXX operator - 
+ region16::		status inverse(region16& reg1, box16& invRect); //XXX
+ 	
+ region16::		int num_rects(){}
+ region16::		box16 rects(); //XXX
+ region16::		int contains_point(int x, int y, box16& box){}
+ region16::		int contains_rectangle(box16& prect){}
+ region16::		int not_empty(){}
+ region16::		box16 extents(); //XXX
+ region16::		status append(region16& src); // XXX operator <<
+ region16::		status validate(int *pOverlap){}
+ region16::		void reset(box16 &pBox){}
+ region16::		void empty(){}