[cairo-commit] rcairo/packages/cairo/ext rb_cairo_constants.c, 1.8, 1.9 rb_cairo_context.c, 1.23, 1.24 rb_cairo_surface.c, 1.19, 1.20

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	rb_cairo_constants.c rb_cairo_context.c rb_cairo_surface.c 
Log Message:
Patched from Ilmari Heikkinen  <kig at misfiring.net>.

* packages/cairo/ext/rb_cairo_context.c (cr_get_font_options):
  Fixed segmentation fault. Use cairo_font_options_create().
* packages/cairo/ext/rb_cairo_surface.c
  (cr_surface_get_font_options): ditto.

* packages/cairo/ext/rb_cairo_constants.c: Fixed
  typo. ANTIALIAS_NONO -> ANTIALIAS_NONE.


Index: rb_cairo_constants.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_constants.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rb_cairo_constants.c	11 Oct 2005 13:23:49 -0000	1.8
+++ rb_cairo_constants.c	16 Oct 2005 03:57:01 -0000	1.9
@@ -136,7 +136,7 @@
   /* cairo_antialias_t */
   rb_define_const (rb_mCairo,    "ANTIALIAS_DEFAULT",
                    INT2FIX (CAIRO_ANTIALIAS_DEFAULT));
-  rb_define_const (rb_mCairo,    "ANTIALIAS_NONO",
+  rb_define_const (rb_mCairo,    "ANTIALIAS_NONE",
                    INT2FIX (CAIRO_ANTIALIAS_NONE));
   rb_define_const (rb_mCairo,    "ANTIALIAS_GRAY",
                    INT2FIX (CAIRO_ANTIALIAS_GRAY));

Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_context.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rb_cairo_context.c	15 Oct 2005 14:33:46 -0000	1.23
+++ rb_cairo_context.c	16 Oct 2005 03:57:01 -0000	1.24
@@ -799,7 +799,7 @@
 static VALUE
 cr_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = NULL;
+  cairo_font_options_t *options = cairo_font_options_create();
   cairo_get_font_options (_SELF, options);
   cr_check_status (_SELF);
   return CRFONTOPTIONS2RVAL (options);

Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_surface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- rb_cairo_surface.c	15 Oct 2005 14:33:46 -0000	1.19
+++ rb_cairo_surface.c	16 Oct 2005 03:57:01 -0000	1.20
@@ -380,7 +380,7 @@
 static VALUE
 cr_surface_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = NULL;
+  cairo_font_options_t *options = cairo_font_options_create();
   cairo_surface_get_font_options (_SELF, options);
   cr_surface_check_status (_SELF);
   options = cairo_font_options_copy (options);