[cairo-commit] rcairo/packages/cairo/ext rb_cairo_context.c, 1.20, 1.21 rb_cairo_surface.c, 1.16, 1.17

[Kouhei Sutou]

Committed by: kou

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

Modified Files:
	rb_cairo_context.c rb_cairo_surface.c 
Log Message:
* packages/cairo/ext/rb_cairo_surface.c
  (cr_image_surface_create_from_png_generic): Set class of the
  surface.

* packages/cairo/ext/rb_cairo_context.c (cr_set_source_generic):
  Fixed wrong variable name.


Index: rb_cairo_context.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_context.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rb_cairo_context.c	11 Oct 2005 14:45:41 -0000	1.20
+++ rb_cairo_context.c	11 Oct 2005 15:40:05 -0000	1.21
@@ -199,7 +199,7 @@
     {
       return cr_set_source (self, arg1);
     }
-  else if (n == 3 && rb_obj_is_kind_of (self, rb_cCairo_Surface))
+  else if (n == 3 && rb_obj_is_kind_of (arg1, rb_cCairo_Surface))
     {
       return cr_set_source_surface (self, arg1, arg2, arg3);
     }

Index: rb_cairo_surface.c
===================================================================
RCS file: /cvs/cairo/rcairo/packages/cairo/ext/rb_cairo_surface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rb_cairo_surface.c	11 Oct 2005 13:23:49 -0000	1.16
+++ rb_cairo_surface.c	11 Oct 2005 15:40:05 -0000	1.17
@@ -370,7 +370,7 @@
 }
 
 static VALUE
-cr_image_surface_create_from_png_generic (VALUE self, VALUE target)
+cr_image_surface_create_from_png_generic (VALUE klass, VALUE target)
 {
   cairo_surface_t *surface;
   if (rb_respond_to (target, cr_id_read))
@@ -379,6 +379,7 @@
     surface = (cairo_surface_t *)cr_image_surface_create_from_png (target);
 
   cr_surface_check_status (surface);
+  cr_surface_set_klass (surface, klass);
   return CRSURFACE2RVAL (surface);
 }
 #endif