cairo 1.6.2 → 1.6.3

data/ChangeLog

@@ -1,5 +1,50 @@
+2008-07-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* NEWS: add a new entry for 1.6.3.
+
+	* src/rb_cairo.c: 1.7.0 -> 1.6.3.
+
+2008-06-20  Kouhei Sutou  <kou@cozmixng.org>
+
+	* README: update OBATA Akio's entry.
+
+	* src/depend (install-so): use INSTALL_DATA and RUBYARCHDIR.
+	Suggested by OBATA Akio. Thanks!!!
+
+	* pkg-config.rb: add libdata.
+
+	* pkg-config.rb:
+	- add /opt/local/lib/pkgconfig as default path.
+	- improve default path guess.
+	Suggested by Carsten Bormann. Thanks!!!
+
+	* README: add Carsten Bormann to thanks list. Thanks!!!
+
+	* test/test_surface.rb: add.
+
+	* src/rb_cairo_surface.c (yield_and_finish): don't finish if it
+	isn't needed.
+
+	* src/rb_cairo_surface.c: finish all guarded surfaces at end.
+
+2008-06-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/: use #ifdef for CAIRO_HAS_*.
+
+	* src/rb_cairo_surface.c: guard custom write surfaces from GC to
+	avoid writing in GC.
+	Reported by James Healy. Thanks!!!
+
+	* README: add James Healy to Thanks list.
+
+	* pkg-config.rb (PackageConfig#guess_default_path): add
+	/usr/share/pkgconfig to default path.
+	Suggested by James Healy. Thanks!!!
+
 2008-06-14  Kouhei Sutou  <kou@cozmixng.org>
 
+	* src/rb_cairo.c: 1.6.2 -> 1.7.0.
+
 	* Rakefile: don't clean on release target to keep generated document.
 
 	* src/rb_cairo_surface.c: rename OpenFile before include rubyio.h.

data/NEWS

@@ -1,3 +1,13 @@
+Release 1.6.3 (2008-07-19) Kouhei Sutou <kou@cozmixng.org>)
+===========================================================
+
+Features
+--------
+  * Fix build failure on Debian GNU/Linux. (reported by James Healy)
+  * Fix GC failure with Ruby 1.8.7. (reported by James Healy)
+  * Improve building on MacOS X. (suggested by Carsten Bormann)
+  * Fix install location of cairo.so. (suggested by OBATA Akio)
+
 Release 1.6.2 (2008-06-14) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================
 

data/README

@@ -67,4 +67,8 @@ Thanks
   * kimura wataru:
     - some advices for RubyCocoa.
     - reports a bug.
-  * OBATA Akio: reports a bug.
+  * OBATA Akio:
+    - reports a bug.
+    - some suggestions.
+  * James Healy: reports bugs.
+  * Carsten Bormann: A suggestion.

data/Rakefile

@@ -5,6 +5,7 @@ require 'English'
 require 'find'
 require 'fileutils'
 require 'rubygems'
+gem 'hoe', "=1.6.0"
 require 'hoe'
 
 base_dir = File.join(File.dirname(__FILE__))

data/pkg-config.rb

@@ -164,46 +164,67 @@ class PackageConfig
     end
   end
 
+  def search_pkg_config_from_path(pkg_config)
+    (ENV["PATH"] || "").split(separator).each do |path|
+      try_pkg_config = Pathname(path) + pkg_config
+      return try_pkg_config if try_pkg_config.exist?
+    end
+    nil
+  end
+
+  def search_pkg_config_by_dln_find_exe(pkg_config)
+    begin
+      require "dl/import"
+    rescue LoadError
+      return nil
+    end
+    dln = Module.new
+    dln.module_eval do
+      if DL.const_defined?(:Importer)
+        extend DL::Importer
+      else
+        extend DL::Importable
+      end
+      begin
+        dlload RbConfig::CONFIG["LIBRUBY"]
+      rescue RuntimeError
+        return nil if $!.message == "unknown error"
+        return nil if /: image not found\z/ =~ $!.message
+        raise
+      rescue DL::DLError
+        return nil
+      end
+      extern "const char *dln_find_exe(const char *, const char *)"
+    end
+    dln.dln_find_exe(pkg_config.to_s, ".")
+  end
+
   def guess_default_path
     default_path = ["/usr/local/lib64/pkgconfig",
                     "/usr/local/lib/pkgconfig",
+                    "/usr/local/libdata/pkgconfig",
+                    "/opt/local/lib/pkgconfig",
                     "/usr/lib64/pkgconfig",
-                    "/usr/lib/pkgconfig"].join(":")
+                    "/usr/lib/pkgconfig",
+                    "/usr/share/pkgconfig"].join(separator)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_path = "#{libdir}:#{default_path}" if libdir
+    default_path = [libdir, default_path].join(separator) if libdir
+
     pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
     pkg_config = Pathname.new(pkg_config)
     unless pkg_config.absolute?
-      begin
-        require "dl/import"
-      rescue LoadError
-        return default_path
-      end
-      dln = Module.new
-      dln.module_eval do
-        if DL.const_defined?(:Importer)
-          extend DL::Importer
-        else
-          extend DL::Importable
-        end
-        begin
-          dlload RbConfig::CONFIG["LIBRUBY"]
-        rescue RuntimeError
-          return default_path if $!.message == "unknown error"
-          return default_path if /: image not found\z/ =~ $!.message
-          raise
-        rescue DL::DLError
-          return default_path
-        end
-        extern "const char *dln_find_exe(const char *, const char *)"
-      end
-      pkg_config = dln.dln_find_exe(pkg_config.to_s, ".")
-      return default_path if pkg_config.nil?
-      return default_path if pkg_config.size.zero?
-      pkg_config = Pathname.new(pkg_config)
+      found_pkg_config = search_pkg_config_from_path(pkg_config)
+      pkg_config = found_pkg_config if found_pkg_config
     end
+    unless pkg_config.absolute?
+      found_pkg_config = search_pkg_config_by_dln_find_exe(pkg_config)
+      pkg_config = found_pkg_config if found_pkg_config
+    end
+
+    return default_path unless pkg_config.absolute?
     [(pkg_config.parent.parent + "lib" + "pkgconfig").to_s,
-     default_path].join(":")
+     (pkg_config.parent.parent + "libdata" + "pkgconfig").to_s,
+     default_path].join(separator)
   end
 end
 

data/src/rb_cairo.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-14 12:17:39 $
+ * $Date: 2008-07-19 11:00:10 $
  *
  * Copyright 2006-2007 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
@@ -58,7 +58,7 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (6), INT2FIX (2), Qnil));
+                                INT2FIX (1), INT2FIX (6), INT2FIX (3), Qnil));
 
   rb_mCairo_Color = rb_const_get (rb_mCairo, rb_intern ("Color"));
   rb_cCairo_Color_Base = rb_const_get (rb_mCairo_Color, rb_intern ("Base"));

data/src/rb_cairo.h

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-30 04:57:51 $
+ * $Date: 2008-06-19 13:00:18 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -18,15 +18,15 @@
 
 #include <cairo.h>
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 #  include <cairo-ps.h>
 #endif
 
-#if CAIRO_HAS_PDF_SURFACE
+#ifdef CAIRO_HAS_PDF_SURFACE
 #  include <cairo-pdf.h>
 #endif
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 #  include <cairo-svg.h>
 #endif
 
@@ -210,10 +210,10 @@ VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
 #define RVAL2CRFORMAT(obj)        (rb_cairo_format_from_ruby_object(obj))
 #define RVAL2CREXTEND(obj)        (rb_cairo_extend_from_ruby_object(obj))
 #define RVAL2CRFILTER(obj)        (rb_cairo_filter_from_ruby_object(obj))
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 #define RVAL2CRSVGVERSION(obj)    (rb_cairo_svg_version_from_ruby_object(obj))
 #endif
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 #  if CAIRO_CHECK_VERSION(1, 5, 2)
 #define RVAL2CRPSLEVEL(obj)       (rb_cairo_ps_level_from_ruby_object(obj))
 #  endif
@@ -234,10 +234,10 @@ cairo_content_t        rb_cairo_content_from_ruby_object        (VALUE obj);
 cairo_format_t         rb_cairo_format_from_ruby_object         (VALUE obj);
 cairo_extend_t         rb_cairo_extend_from_ruby_object         (VALUE obj);
 cairo_filter_t         rb_cairo_filter_from_ruby_object         (VALUE obj);
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 cairo_svg_version_t    rb_cairo_svg_version_from_ruby_object    (VALUE obj);
 #endif
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 #  if CAIRO_CHECK_VERSION(1, 5, 2)
 cairo_ps_level_t       rb_cairo_ps_level_from_ruby_object       (VALUE obj);
 #  endif

data/src/rb_cairo_constants.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-04 04:25:16 $
+ * $Date: 2008-06-19 13:00:18 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -124,23 +124,27 @@ DEFINE_RVAL2ENUM(content, CONTENT)
 DEFINE_RVAL2ENUM(format, FORMAT)
 DEFINE_RVAL2ENUM(extend, EXTEND)
 DEFINE_RVAL2ENUM(filter, FILTER)
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 DEFINE_RVAL2ENUM(svg_version, SVG_VERSION)
 #endif
-#if CAIRO_HAS_PS_SURFACE && CAIRO_CHECK_VERSION(1, 5, 2)
+
+#ifdef CAIRO_HAS_PS_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
 DEFINE_RVAL2ENUM(ps_level, PS_LEVEL)
-#else
-#  ifdef RB_CAIRO_PLATFORM_WIN32
+#define PS_LEVEL_ENUM_DEFINED 1
+#  endif
+#endif
+
+#if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(PS_LEVEL_ENUM_DEFINED)
 void
 rb_cairo_ps_level_from_ruby_object (VALUE rb_ps_level)
 {
   /* dummy */
 }
-#  endif
 #endif
 
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 static VALUE
 cr_svg_get_versions (VALUE self)
 {
@@ -187,7 +191,7 @@ cr_format_stride_for_width (VALUE self, VALUE format, VALUE width)
 }
 #endif
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 #  if CAIRO_CHECK_VERSION(1, 5, 8)
 static VALUE
 cr_ps_get_levels (VALUE self)
@@ -428,7 +432,7 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_Filter,    "GAUSSIAN",
                    INT2FIX (CAIRO_FILTER_GAUSSIAN));
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
   /* cairo_svg_version_t */
   rb_mCairo_SVGVersion = rb_define_module_under (rb_mCairo, "SVGVersion");
   rb_define_const (rb_mCairo_SVGVersion, "VERSION_1_1",
@@ -442,7 +446,8 @@ Init_cairo_constants (void)
                               cr_svg_version_to_string, -1);
 #endif
 
-#if CAIRO_HAS_PS_SURFACE && CAIRO_CHECK_VERSION(1, 5, 2)
+#ifdef CAIRO_HAS_PS_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
   /* cairo_ps_level_t */
   rb_mCairo_PSLevel = rb_define_module_under (rb_mCairo, "PSLevel");
   rb_define_const (rb_mCairo_PSLevel, "LEVEL_2", INT2FIX (CAIRO_PS_LEVEL_2));
@@ -452,5 +457,6 @@ Init_cairo_constants (void)
                               cr_ps_get_levels, 0);
   rb_define_singleton_method (rb_mCairo_PSLevel, "name",
                               cr_ps_level_to_string, -1);
+#  endif
 #endif
 }

data/src/rb_cairo_surface.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-06-14 12:38:25 $
+ * $Date: 2008-06-20 02:01:53 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -15,7 +15,9 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
-#if CAIRO_HAS_WIN32_SURFACE
+#include <st.h>
+
+#ifdef CAIRO_HAS_WIN32_SURFACE
 #  define OpenFile OpenFile_win32
 #  include <cairo-win32.h>
 #  undef OpenFile
@@ -23,7 +25,7 @@
 
 #include <rubyio.h>
 
-#if CAIRO_HAS_QUARTZ_SURFACE
+#ifdef CAIRO_HAS_QUARTZ_SURFACE
 #  ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
 enum ruby_value_type {
   RUBY_T_DATA = T_DATA
@@ -34,7 +36,9 @@ enum ruby_value_type {
 #  define T_DATA RUBY_T_DATA
 #endif
 
-#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_SVG_SURFACE
+#if defined(CAIRO_HAS_PS_SURFACE) || \
+  defined(CAIRO_HAS_PDF_SURFACE) || \
+  defined(CAIRO_HAS_SVG_SURFACE)
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 1
 #else
 #  define HAS_CREATE_CR_CLOSURE_SURFACE 0
@@ -58,7 +62,11 @@ static ID cr_id_inspect;
 static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
+static ID cr_id_instances;
+static ID cr_id_dup;
 static cairo_user_data_key_t cr_closure_key;
+static cairo_user_data_key_t cr_object_holder_key;
+static cairo_user_data_key_t cr_finished_key;
 
 #define _SELF  (RVAL2CRSURFACE(self))
 
@@ -165,7 +173,7 @@ cr_closure_new (VALUE target)
 static void
 cr_closure_destroy (cr_io_callback_closure_t *closure)
 {
-  free (closure);
+  xfree (closure);
 }
 
 static void
@@ -287,13 +295,53 @@ rb_cairo_surface_from_ruby_object (VALUE obj)
   return surface;
 }
 
+static void
+add_gc_guard (VALUE self)
+{
+  rb_hash_aset (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
+                self, Qnil);
+}
+
+static void
+remove_gc_guard (VALUE self)
+{
+  rb_hash_delete (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
+                  self);
+}
+
+typedef struct cr_object_holder {
+  VALUE object;
+} cr_object_holder_t;
+
+static cr_object_holder_t *
+cr_object_holder_new (VALUE object)
+{
+  cr_object_holder_t *holder;
+
+  holder = ALLOC(cr_object_holder_t);
+  add_gc_guard (object);
+  holder->object = object;
+  return holder;
+}
+
+static void
+cr_object_holder_free (void *ptr)
+{
+  cr_object_holder_t *holder = ptr;
+
+  if (!NIL_P (holder->object))
+    remove_gc_guard (holder->object);
+
+  xfree (holder);
+}
+
 static void
 cr_surface_free (void *ptr)
 {
-  if (ptr)
-    {
-      cairo_surface_destroy ((cairo_surface_t *) ptr);
-    }
+  cairo_surface_t *surface = ptr;
+
+  if (surface)
+    cairo_surface_destroy (surface);
 }
 
 VALUE
@@ -316,9 +364,11 @@ VALUE
 rb_cairo_surface_to_ruby_object_with_destroy (cairo_surface_t *surface)
 {
   VALUE rb_surface;
+
   rb_surface = rb_cairo_surface_to_ruby_object (surface);
   if (surface)
     cairo_surface_destroy (surface);
+
   return rb_surface;
 }
 
@@ -329,23 +379,36 @@ cr_surface_allocate (VALUE klass)
 }
 
 /* Surface manipulation */
+static VALUE
+cr_surface_finish (VALUE self)
+{
+  cairo_surface_t *surface;
+  cr_io_callback_closure_t *closure;
+
+  surface = _SELF;
+  closure = cairo_surface_get_user_data (surface, &cr_closure_key);
+
+  cairo_surface_finish (surface);
+  cairo_surface_set_user_data (surface, &cr_finished_key, (void *)CR_TRUE, NULL);
+  cairo_surface_set_user_data (surface, &cr_object_holder_key, NULL, NULL);
+
+  if (closure && !NIL_P (closure->error))
+    rb_exc_raise (closure->error);
+  cr_surface_check_status (surface);
+
+  return self;
+}
+
 static void
 yield_and_finish (VALUE self)
 {
   cairo_surface_t *surface;
-  cairo_status_t status;
 
   rb_yield (self);
 
   surface = _SELF;
-  if (cairo_surface_status (surface))
-    return;
-  cairo_surface_finish (surface);
-  status = cairo_surface_status (surface);
-  if (status == CAIRO_STATUS_SUCCESS || status == CAIRO_STATUS_SURFACE_FINISHED)
-    return;
-
-  cr_surface_check_status (surface);
+  if (!cairo_surface_get_user_data (surface, &cr_finished_key))
+    cr_surface_finish (self);
 }
 
 static VALUE
@@ -360,21 +423,6 @@ cr_surface_create_similar (VALUE self, VALUE content, VALUE width, VALUE height)
   return CRSURFACE2RVAL_WITH_DESTROY (surface);
 }
 
-static VALUE
-cr_surface_finish (VALUE self)
-{
-  cr_io_callback_closure_t *closure;
-  closure = cairo_surface_get_user_data (_SELF, &cr_closure_key);
-  
-  cairo_surface_finish (_SELF);
-
-  if (closure && !NIL_P (closure->error))
-    rb_exc_raise (closure->error);
-  
-  cr_surface_check_status (_SELF);
-  return self;
-}
-
 static VALUE
 cr_surface_get_content (VALUE self)
 {
@@ -382,7 +430,7 @@ cr_surface_get_content (VALUE self)
 }
 
 
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
 static VALUE
 cr_surface_write_to_png_stream (VALUE self, VALUE target)
 {
@@ -527,7 +575,7 @@ cr_surface_show_page (VALUE self)
 #endif
 
 /* Image-surface functions */
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
 static cairo_surface_t *
 cr_image_surface_create_from_png_stream (VALUE target)
 {
@@ -717,6 +765,9 @@ cr_ ## type ## _surface_initialize (int argc, VALUE *argv, VALUE self)  \
           rb_ivar_set (self, cr_id_target, target);                     \
           cairo_surface_set_user_data (surface, &cr_closure_key,        \
                                        closure, cr_closure_free);       \
+          cairo_surface_set_user_data (surface, &cr_object_holder_key,  \
+                                       cr_object_holder_new(self),      \
+                                       cr_object_holder_free);          \
         }                                                               \
     }                                                                   \
   else                                                                  \
@@ -764,7 +815,7 @@ cr_ ## type ## _surface_set_size (int argc, VALUE *argv, VALUE self)    \
   return Qnil;                                                          \
 }
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
 /* PS-surface functions */
 DEFINE_SURFACE(ps)
 DEFINE_SURFACE_SET_SIZE(ps)
@@ -824,13 +875,13 @@ cr_ps_surface_set_eps (VALUE self, VALUE eps)
 #  endif
 #endif
 
-#if CAIRO_HAS_PDF_SURFACE
+#ifdef CAIRO_HAS_PDF_SURFACE
 /* PDF-surface functions */
 DEFINE_SURFACE(pdf)
 DEFINE_SURFACE_SET_SIZE(pdf)
 #endif
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
 /* SVG-surface functions */
 DEFINE_SURFACE(svg)
 
@@ -843,7 +894,7 @@ cr_svg_surface_restrict_to_version (VALUE self, VALUE version)
 }
 #endif
 
-#if CAIRO_HAS_WIN32_SURFACE
+#ifdef CAIRO_HAS_WIN32_SURFACE
 /* WIN32-surface functions */
 
 /* from dl/dl.h (ruby 1.9) */
@@ -981,7 +1032,7 @@ cr_win32_surface_get_image (VALUE self)
 #  endif
 #endif
 
-#if CAIRO_HAS_QUARTZ_SURFACE && defined(HAVE_RUBY_COCOA)
+#if defined(CAIRO_HAS_QUARTZ_SURFACE) && defined(HAVE_RUBY_COCOA)
 /* Quartz-surface functions */
 
 #include <objc/objc-runtime.h>
@@ -1100,6 +1151,21 @@ cr_quartz_image_surface_get_image (VALUE self)
 #  endif
 #endif
 
+static int
+cr_finish_all_guarded_surfaces_at_end_iter (VALUE key, VALUE value, VALUE data)
+{
+  cr_surface_finish (key);
+  return ST_CONTINUE;
+}
+
+static void
+cr_finish_all_guarded_surfaces_at_end (VALUE data)
+{
+  rb_hash_foreach (rb_funcall (rb_ivar_get (rb_cCairo_Surface, cr_id_instances),
+                               cr_id_dup, 0),
+                   cr_finish_all_guarded_surfaces_at_end_iter,
+                   Qnil);
+}
 
 void
 Init_cairo_surface (void)
@@ -1111,11 +1177,18 @@ Init_cairo_surface (void)
   cr_id_parse = rb_intern ("parse");
   cr_id_size = rb_intern ("size");
   cr_id_set_unit = rb_intern ("unit=");
+  cr_id_instances = rb_intern ("instances");
+  cr_id_dup = rb_intern ("dup");
+
+  rb_set_end_proc(cr_finish_all_guarded_surfaces_at_end, Qnil);
 
   rb_cCairo_Surface =
     rb_define_class_under (rb_mCairo, "Surface", rb_cObject);
   rb_define_alloc_func (rb_cCairo_Surface, cr_surface_allocate);
-  
+
+  rb_ivar_set (rb_cCairo_Surface, cr_id_instances, rb_hash_new ());
+
+
   rb_define_method (rb_cCairo_Surface, "create_similar",
                     cr_surface_create_similar, 3);
   rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
@@ -1138,7 +1211,7 @@ Init_cairo_surface (void)
                     cr_surface_show_page, 2);
 #endif
 
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
   rb_define_method (rb_cCairo_Surface, "write_to_png",
                     cr_surface_write_to_png_generic, 1);
 #endif
@@ -1149,7 +1222,7 @@ Init_cairo_surface (void)
   rb_cCairo_ImageSurface =
     rb_define_class_under (rb_mCairo, "ImageSurface", rb_cCairo_Surface);
   
-#if CAIRO_HAS_PNG_FUNCTIONS
+#ifdef CAIRO_HAS_PNG_FUNCTIONS
   rb_define_singleton_method (rb_cCairo_ImageSurface, "from_png",
                               cr_image_surface_create_from_png_generic, 1);
 #endif
@@ -1176,7 +1249,7 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_ ## name ## Surface, "initialize",        \
                     cr_ ## type ## _surface_initialize, -1);
 
-#if CAIRO_HAS_PS_SURFACE
+#ifdef CAIRO_HAS_PS_SURFACE
   /* PS-surface */
   INIT_SURFACE(ps, PS)
 
@@ -1188,17 +1261,17 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_PSSurface, "dsc_begin_page_setup",
                     cr_ps_surface_dsc_begin_page_setup, 0);
 
-#if CAIRO_CHECK_VERSION(1, 5, 2)
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
   rb_define_method (rb_cCairo_PSSurface, "restrict_to_level",
                     cr_ps_surface_restrict_to_level, 1);
   rb_define_method (rb_cCairo_PSSurface, "eps?", cr_ps_surface_get_eps, 0);
   rb_define_method (rb_cCairo_PSSurface, "set_eps", cr_ps_surface_set_eps, 1);
-#endif
+#  endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PSSurface);
 #endif
 
-#if CAIRO_HAS_PDF_SURFACE
+#ifdef CAIRO_HAS_PDF_SURFACE
   /* PDF-surface */
   INIT_SURFACE(pdf, PDF)
 
@@ -1208,7 +1281,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
 #endif
 
-#if CAIRO_HAS_SVG_SURFACE
+#ifdef CAIRO_HAS_SVG_SURFACE
   /* SVG-surface */
   INIT_SURFACE(svg, SVG)
 
@@ -1218,7 +1291,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_SVGSurface);
 #endif
 
-#if CAIRO_HAS_WIN32_SURFACE
+#ifdef CAIRO_HAS_WIN32_SURFACE
   /* Win32-surface */
   rb_cCairo_Win32Surface =
     rb_define_class_under (rb_mCairo, "Win32Surface", rb_cCairo_Surface);
@@ -1244,7 +1317,7 @@ Init_cairo_surface (void)
 
 #endif
 
-#if CAIRO_HAS_QUARTZ_SURFACE && defined(HAVE_RUBY_COCOA)
+#if defined(CAIRO_HAS_QUARTZ_SURFACE) && defined(HAVE_RUBY_COCOA)
   /* Quartz-surface */
 
   rb_cCairo_QuartzSurface =

data/test/test_surface.rb

@@ -0,0 +1,28 @@
+require 'cairo'
+require 'stringio'
+
+class SurfaceTest < Test::Unit::TestCase
+  def test_new
+    output = StringIO.new
+    surface = Cairo::PDFSurface.new(output, 10, 10)
+    assert_no_match(/%%EOF\s*\z/m, output.string)
+    surface.finish
+    assert_match(/%%EOF\s*\z/m, output.string)
+  end
+
+  def test_new_with_block
+    output = StringIO.new
+    Cairo::PDFSurface.new(output, 10, 10) do |surface|
+      assert_no_match(/%%EOF\s*\z/m, output.string)
+    end
+    assert_match(/%%EOF\s*\z/m, output.string)
+  end
+
+  def test_new_with_block_and_finish
+    assert_nothing_raised do
+      Cairo::PDFSurface.new(StringIO.new, 10, 10) do |surface|
+        surface.finish
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cairo
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors: 
 - Evan Marin
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-14 00:00:00 +09:00
+date: 2008-07-19 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -387,6 +387,7 @@ files:
 - test/run-test.rb
 - test/test_paper.rb
 - test/test_pkg_config.rb
+- test/test_surface.rb
 has_rdoc: false
 homepage: http://cairographics.org/rcairo
 post_install_message: