[cairo-commit] cairoxx pixman,1.2,1.3

[David Bellot]

Committed by: yimyom

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

Modified Files:
	pixman 
Log Message:
etc etc ...


Index: pixman
===================================================================
RCS file: /cvs/cairo/cairoxx/pixman,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** a/pixman	11 Apr 2004 03:02:58 -0000	1.2
--- b/pixman	18 Apr 2004 03:04:00 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ #ifndef _PIXMAN_HPP_
+ #define _PIXMAN_HPP_
+ 
  // C++ Bindings for Cairo
  // Declaration of C++ pixman bindings
***************
*** 18,35 ****
  // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  //
! // Author : David Bellot <bellot at stat.berkeley.edu, yimyom at users.sourceforge.net, bellot at inrialpes.fr>
  
! class CompositeFunc {
! 	public:
! 	private:
! };
  
- // ############
- // Ic namespace
- // ############
  
- namespace Ic {
  
! typedef pixman_operator_t ic_operator;
  
  class AccessMap {
--- 21,55 ----
  // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  //
! // Author : David Bellot <bellot at stat.berkeley.edu, yimyom at users.sourceforge.net>
  
! #include <pixman.h>
  
  
  
! // ################
! // Pixman namespace
! // ################
! 
! namespace Pixman {
! 
! // Typedef statements
! typedef pixman_operator_t 		operator;
! typedef pixman_format_name_t 		format_name;
! typedef pixman_region_status_t 		status;
! typedef enum {rgnOUT, rgnIN, rgnPART} 	rgn;
! typedef pixman_format_tName 		tName;	// XXX format_tName or tName
! typedef pixman_fixed16_16_t 		fixed16_16;
! typedef pixman_point_fixed_t 		point_fixed;
! typedef pixman_line_fixed_t 		line_fixed;
! typedef pixman_rectangle_t		rectangle;
! typedef pixman_triangle_t		triangle;
! typedef pixman_trapezoid_t		trapezoid;
! typedef pixman_vector_t			vector
! typedef pixman_transform_t		transform;
! typedef pixman_filter_t			filter;
! 
! // ####################
! // Classes declarations
! // ####################
  
  class AccessMap {
***************
*** 38,42 ****
  	private:
  };
! 
  class CombineFunc {
  	public:
--- 58,65 ----
  	private:
  };
! class CompositeFunc {
! 	public:
! 	private:
! };
  class CombineFunc {
  	public:
***************
*** 84,101 ****
  };
  
- }
- 
- // ################
- // Pixman namespace
- // ################
- 
- namespace Pixman {
- 
- typedef pixman_region_status_t status;
- typedef enum {rgnOUT, rgnIN, rgnPART} rgn;
- typedef pixman_format_tName tName;	// XXX format_tName or tName
- typedef pixman_fixed16_16_t; fixed16_16;
- typedef pixman_point_fixed_t point_fixed;
- typedef pixman_line_fixed_t line_fixed;
  
  class compositeFetch {
--- 107,110 ----
***************
*** 126,130 ****
--- 135,142 ----
  class box16 {
  	public:
+ 		box16();
+ 		~box16();
  	private:
+ 		pixman_box16_t		*obj;
  };
  
***************
*** 134,142 ****
  };
  
- class filter {
- 	public:
- 	private:
- };
- 
  class fixed16_16 {
  	public:
--- 146,149 ----
***************
*** 153,156 ****
--- 160,164 ----
  		void pixel_to_color(pixman_bits_t		pixel, pixman_color_t		*color);
  	private:
+ 		pixman_format_t		*obj;
  };
  
***************
*** 162,166 ****
  class image {
  	public:
! 		image(int width, int height);
  		image(pixman_bits_t *data, format& f,  int width, int height, int bpp, int stride);
  		~image();
--- 170,174 ----
  class image {
  	public:
! 		image(format& f, int width, int height);
  		image(pixman_bits_t *data, format& f,  int width, int height, int bpp, int stride);
  		~image();
***************
*** 169,173 ****
  		int set_transform(pixman_transform_t *transform);
  		void set_repeat(int repeat);
! 		void set_filter(pixman_filter_t	filter);
  		int get_width();
  		int get_height();
--- 177,181 ----
  		int set_transform(pixman_transform_t *transform);
  		void set_repeat(int repeat);
! 		void set_filter(filter	f);
  		int get_width();
  		int get_height();
***************
*** 202,210 ****
  };
  
- class rectangle {
- 	public:
- 	private:
- };
- 
  class region16 {
  	public:
--- 210,213 ----
***************
*** 214,223 ****
  
  		void translate(int x, int y);
! 		status copy(region16& dest);
! 		status intersect(pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2); //XXX
! 		status union(pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2); //XXX
! 		status union_rect(region16& dest, int x, int y, unsigned int width, unsigned int height); 
! 		status substract(pixman_region16_t *regD, pixman_region16_t *regM, pixman_region16_t *regS); //XXX
! 		status inverse(pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_box16_t *invRect); //XXX
  	
  		int num_rects();
--- 217,226 ----
  
  		void translate(int x, int y);
! 		status copy(region16& dest);	// XXX operator =
! 		status intersect(region16& reg1, region16& reg2); //XXX operator &
! 		status union(region16& reg1, region16& reg2); //XXX  operator | 
! 		status union_rect(region16& src, int x, int y, unsigned int width, unsigned int height); 
! 		status substract(region16& regM, region16& regS); //XXX operator - 
! 		status inverse(region16& reg1, box16& invRect); //XXX
  	
  		int num_rects();
***************
*** 227,231 ****
  		int not_empty();
  		box16 extents(); //XXX
! 		status append(region16& src); // XXX operator
  		status validate(int *pOverlap);
  		void reset(box16 &pBox);
--- 230,234 ----
  		int not_empty();
  		box16 extents(); //XXX
! 		status append(region16& src); // XXX operator <<
  		status validate(int *pOverlap);
  		void reset(box16 &pBox);
***************
*** 246,264 ****
  };
  
- class trapezoid {
- 	public:
- 	private:
- };
- 
- class triangle {
- 	public:
- 	private:
- };
- 
- class vector {
- 	public:
- 	private:
- };
- 
  class region16_tData {
  	public:
--- 249,252 ----