[cairo-commit] rcairo/packages/cairo/ext rb_cairo.c, 1.3, 1.4 rb_cairo.h, 1.2, 1.3 rb_cairo_constants.c, 1.3, 1.4 rb_cairo_constants.h, 1.1, NONE rb_cairo_context.c, 1.7, 1.8 rb_cairo_context.h, 1.1, NONE rb_cairo_exception.h, 1.2, NONE rb_cairo_font_extents.c, 1.1, 1.2 rb_cairo_font_face.c, 1.1, 1.2 rb_cairo_font_face.h, 1.1, NONE rb_cairo_glyph.c, 1.1, 1.2 rb_cairo_glyph.h, 1.1, NONE rb_cairo_matrix.c, 1.5, 1.6 rb_cairo_matrix.h, 1.2, NONE rb_cairo_pattern.c, 1.3, 1.4 rb_cairo_pattern.h, 1.2, NONE rb_cairo_surface.c, 1.3, 1.4 rb_cairo_surface.h, 1.1, NONE rb_cairo_text_extents.c, 1.1, 1.2 rb_cairo_text_extents.h, 1.1, NONE

[Oeyvind Kolaas]

Committed by: pippin

Update of /cvs/cairo/rcairo/packages/cairo/ext
In directory gabe:/tmp/cvs-serv1256/packages/cairo/ext

Modified Files:
	rb_cairo.c rb_cairo.h rb_cairo_constants.c rb_cairo_context.c 
	rb_cairo_font_extents.c rb_cairo_font_face.c rb_cairo_glyph.c 
	rb_cairo_matrix.c rb_cairo_pattern.c rb_cairo_surface.c 
	rb_cairo_text_extents.c 
Removed Files:
	rb_cairo_constants.h rb_cairo_context.h rb_cairo_exception.h 
	rb_cairo_font_face.h rb_cairo_glyph.h rb_cairo_matrix.h 
	rb_cairo_pattern.h rb_cairo_surface.h rb_cairo_text_extents.h 
Log Message:
header cleanup

Index: rb_cairo.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo.c	23 Jun 2005 09:30:48 -0000	1.3
+++ rb_cairo.c	9 Sep 2005 11:28:02 -0000	1.4
@@ -11,7 +11,16 @@
 
 #include "rb_cairo.h"
 
-VALUE rb_mCairo;
+extern void Init_cairo_context (void);
+extern void Init_cairo_matrix (void);
+extern void Init_cairo_surface (void);
+extern void Init_cairo_constants (void);
+extern void Init_cairo_exception (void);
+extern void Init_cairo_font (void);
+extern void Init_cairo_text_extents (void);
+extern void Init_cairo_font_extents (void);
+extern void Init_cairo_pattern (void);
+extern void Init_cairo_glyph (void);
 
 void
 Init_cairo ()

Index: rb_cairo.h
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rb_cairo.h	23 Jun 2005 09:30:48 -0000	1.2
+++ rb_cairo.h	9 Sep 2005 11:28:02 -0000	1.3
@@ -18,16 +18,42 @@
 #include "ruby.h"
 
 extern VALUE rb_mCairo;
+extern VALUE rb_cCairo_Context;
+extern VALUE rb_cCairo_Matrix;
+extern VALUE rb_cCairo_Pattern;
+extern VALUE rb_cCairo_FontFace;
+extern VALUE rb_cCairo_FontExtents;
+extern VALUE rb_cCairo_TextExtents;
+extern VALUE rb_cCairo_Glyph;
+extern VALUE rb_cCairo_Surface;
 
-#include "rb_cairo_constants.h"
-#include "rb_cairo_context.h"
-#include "rb_cairo_exception.h"
-#include "rb_cairo_matrix.h"
-#include "rb_cairo_pattern.h"
-#include "rb_cairo_font_face.h"
-#include "rb_cairo_font_extents.h"
-#include "rb_cairo_text_extents.h"
-#include "rb_cairo_glyph.h"
-#include "rb_cairo_surface.h"
+VALUE    rb_cairo_new_from  (cairo_t *cr);
+cairo_t *rb_v_to_cairo_t    (VALUE value);
+void     rb_free_context    (void *ptr);
+
+void rb_cairo_raise_exception (cairo_status_t  status);
+
+cairo_matrix_t *rb_v_to_cairo_matrix_t (VALUE value);
+VALUE           rb_cairo_matrix_wrap   (cairo_matrix_t *matrix);
+void            rb_free_matrix         (void *ptr);
+
+VALUE            rb_cairo_pattern_wrap   (cairo_pattern_t *pat);
+cairo_pattern_t *rb_v_to_cairo_pattern_t (VALUE value);
+void             rb_free_pattern         (void *ptr);
+
+cairo_font_face_t *value_to_font_face   (VALUE value);
+void               rb_free_font_face    (void *ptr);
+
+cairo_font_extents_t *rb_v_to_cairo_font_extents_t (VALUE value);
+void                  rb_free_font_extents         (void *ptr);
+
+cairo_text_extents_t *rb_v_to_cairo_text_extents_t (VALUE value);
+void                  rb_free_text_extents         (void *ptr);
+
+cairo_glyph_t *rb_v_to_cairo_glyph_t (VALUE value);
+void           rb_free_glyph         (void *ptr);
+
+cairo_surface_t *rb_v_to_cairo_surface_t (VALUE value);
+void             rb_free_surface         (void *ptr);
 
 #endif

Index: rb_cairo_constants.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_constants.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo_constants.c	23 Jun 2005 09:30:48 -0000	1.3
+++ rb_cairo_constants.c	9 Sep 2005 11:28:02 -0000	1.4
@@ -9,7 +9,7 @@
 */
 
 
-#include "rb_cairo_constants.h"
+#include "rb_cairo.h"
 
 void
 Init_cairo_constants (void)

--- rb_cairo_constants.h DELETED ---

Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_context.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rb_cairo_context.c	8 Sep 2005 09:16:59 -0000	1.7
+++ rb_cairo_context.c	9 Sep 2005 11:28:02 -0000	1.8
@@ -8,9 +8,7 @@
  *
 */
 
-#include "rb_cairo_context.h"
-
-VALUE rb_cCairo_Context;
+#include "rb_cairo.h"
 
 #define _SELF  (DATA_PTR(self))
 

--- rb_cairo_context.h DELETED ---

--- rb_cairo_exception.h DELETED ---

Index: rb_cairo_font_extents.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_font_extents.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_font_extents.c	8 Feb 2005 01:28:21 -0000	1.1
+++ rb_cairo_font_extents.c	9 Sep 2005 11:28:02 -0000	1.2
@@ -9,12 +9,10 @@
  */
 
 
-#include "rb_cairo_font_extents.h"
+#include "rb_cairo.h"
 
 #define _SELF  ((cairo_font_extents_t *)DATA_PTR(self))
 
-VALUE rb_cCairo_FontExtents;
-
 cairo_font_extents_t *
 rb_v_to_cairo_font_extents_t (VALUE value)
 {

Index: rb_cairo_font_face.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_font_face.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_font_face.c	23 Jun 2005 09:35:08 -0000	1.1
+++ rb_cairo_font_face.c	9 Sep 2005 11:28:02 -0000	1.2
@@ -9,12 +9,10 @@
 */
 
 
-#include "rb_cairo_font_face.h"
+#include "rb_cairo.h"
 
 #define _SELF  (DATA_PTR(self))
 
-VALUE rb_cCairo_FontFace;
-
 cairo_font_face_t *
 value_to_font_face (VALUE value)
 {

--- rb_cairo_font_face.h DELETED ---

Index: rb_cairo_glyph.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_glyph.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_glyph.c	8 Feb 2005 01:28:21 -0000	1.1
+++ rb_cairo_glyph.c	9 Sep 2005 11:28:02 -0000	1.2
@@ -9,9 +9,7 @@
  */
 
 
-#include "rb_cairo_glyph.h"
-
-VALUE rb_cCairo_Glyph;
+#include "rb_cairo.h"
 
 #define _SELF  ((cairo_glyph_t *)DATA_PTR(self))
 

--- rb_cairo_glyph.h DELETED ---

Index: rb_cairo_matrix.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_matrix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rb_cairo_matrix.c	8 Sep 2005 09:16:59 -0000	1.5
+++ rb_cairo_matrix.c	9 Sep 2005 11:28:02 -0000	1.6
@@ -9,12 +9,10 @@
  */
 
 
-#include "rb_cairo_matrix.h"
+#include "rb_cairo.h"
 
 #define _SELF  (DATA_PTR(self))
 
-VALUE rb_cCairo_Matrix;
-
 cairo_matrix_t *
 rb_v_to_cairo_matrix_t (VALUE value)
 {

--- rb_cairo_matrix.h DELETED ---

Index: rb_cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_pattern.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo_pattern.c	23 Jun 2005 09:30:48 -0000	1.3
+++ rb_cairo_pattern.c	9 Sep 2005 11:28:02 -0000	1.4
@@ -12,8 +12,6 @@
 
 #define _SELF  (DATA_PTR(self))
 
-VALUE rb_cCairo_Pattern;
-
 cairo_pattern_t *
 rb_v_to_cairo_pattern_t (VALUE value)
 {

--- rb_cairo_pattern.h DELETED ---

Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_surface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rb_cairo_surface.c	23 Jun 2005 09:30:48 -0000	1.3
+++ rb_cairo_surface.c	9 Sep 2005 11:28:02 -0000	1.4
@@ -50,8 +50,6 @@
 }
 
 
-VALUE rb_cCairo_Surface;
-
 cairo_surface_t *
 rb_v_to_cairo_surface_t (VALUE value)
 {

--- rb_cairo_surface.h DELETED ---

Index: rb_cairo_text_extents.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_text_extents.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rb_cairo_text_extents.c	8 Feb 2005 01:28:21 -0000	1.1
+++ rb_cairo_text_extents.c	9 Sep 2005 11:28:02 -0000	1.2
@@ -10,9 +10,7 @@
 
 #define _SELF  ((cairo_text_extents_t *)DATA_PTR(self))
 
-#include "rb_cairo_text_extents.h"
-
-VALUE rb_cCairo_TextExtents;
+#include "rb_cairo.h"
 
 cairo_text_extents_t *
 rb_v_to_cairo_text_extents_t (VALUE value)

--- rb_cairo_text_extents.h DELETED ---