cairo 1.6.1-x86-mswin32 → 1.7.0-x86-mswin32

data/extconf.rb

@@ -80,7 +80,9 @@ major, minor, micro = 1, 2, 0
 
 PKGConfig.have_package(pkg, major, minor, micro) or exit 1
 
-have_func("rb_errinfo")
+have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
+have_func("rb_errinfo", "ruby.h")
+have_type("enum ruby_value_type", "ruby.h")
 
 check_win32
 target_name = File.basename(modname)

data/pkg-config.rb

@@ -164,41 +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/lib/pkgconfig:/usr/lib/pkgconfig"
+    default_path = ["/usr/local/lib64/pkgconfig",
+                    "/usr/local/lib/pkgconfig",
+                    "/usr/local/libdata/pkgconfig",
+                    "/opt/local/lib/pkgconfig",
+                    "/usr/lib64/pkgconfig",
+                    "/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"
-          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, nil)
-      return default_path if pkg_config.nil?
-      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/cairo.def

@@ -16,11 +16,15 @@ EXPORTS
     rb_cCairo_LinearPattern   DATA
     rb_cCairo_RadialPattern   DATA
     rb_cCairo_FontFace        DATA
+    rb_cCairo_ToyFontFace     DATA
+    rb_cCairo_UserFontFace    DATA
+    rb_cCairo_UserFontFace_TextToGlyphsData DATA
     rb_cCairo_FontExtents     DATA
     rb_cCairo_FontOptions     DATA
     rb_cCairo_ScaledFont      DATA
     rb_cCairo_TextExtents     DATA
     rb_cCairo_Glyph           DATA
+    rb_cCairo_TextCluster     DATA
     rb_cCairo_Surface         DATA
     rb_cCairo_ImageSurface    DATA
     rb_cCairo_PDFSurface      DATA
@@ -48,6 +52,7 @@ EXPORTS
     rb_mCairo_Filter          DATA
     rb_mCairo_SVGVersion      DATA
     rb_mCairo_PSLevel         DATA
+    rb_mCairo_LCDFilter       DATA
 
     rb_mCairo_Color           DATA
     rb_cCairo_Color_Base      DATA
@@ -73,6 +78,8 @@ EXPORTS
     rb_cairo_text_extents_to_ruby_object
     rb_cairo_glyph_from_ruby_object
     rb_cairo_glyph_to_ruby_object
+    rb_cairo_text_cluster_from_ruby_object
+    rb_cairo_text_cluster_to_ruby_object
     rb_cairo_surface_from_ruby_object
     rb_cairo_surface_to_ruby_object
     rb_cairo_surface_to_ruby_object_with_destroy
@@ -93,4 +100,5 @@ EXPORTS
     rb_cairo_filter_from_ruby_object
     rb_cairo_svg_version_from_ruby_object
     rb_cairo_ps_level_from_ruby_object
+    rb_cairo_lcd_filter_from_ruby_object
     rb_cairo_check_status

data/src/lib/cairo.rb

@@ -45,14 +45,19 @@ require 'cairo/constants'
 module Cairo
   class << self
     undef __add_one_arg_setter
-  end
 
-  module_function
-  def bindings_version
-    major, minor, micro, tag = BINDINGS_VERSION
-    version = [major, minor, micro].join('.')
-    version << "-#{tag}" if tag
-    version
+    def bindings_version
+      major, minor, micro, tag = BINDINGS_VERSION
+      version = [major, minor, micro].join('.')
+      version << "-#{tag}" if tag
+      version
+    end
+
+    def exit_application(exception, status)
+      puts("#{exception.class}: #{exception}")
+      puts(exception.backtrace)
+      exit(status)
+    end
   end
 
   class Surface

data/src/lib/cairo/constants.rb

@@ -18,4 +18,5 @@ module Cairo
   define_constants.call(PathDataType, nil, Path)
   define_constants.call(SVGVersion, nil, SVGSurface)
   define_constants.call(SVGVersion, "SVG")
+  define_constants.call(LCDFilter, "LCD_FILTER") if const_defined?(:LCDFilter)
 end

data/src/rb_cairo.c

@@ -3,9 +3,9 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-24 12:36:17 $
+ * $Date: 2008-08-16 08:16:39 $
  *
- * Copyright 2006-2007 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -27,6 +27,24 @@ rb_cairo_def_setters (VALUE klass)
   rb_funcall (rb_mCairo, id__add_one_arg_setter, 1, klass);
 }
 
+static VALUE
+rb_cairo_satisfied_version (int argc, VALUE *argv, VALUE self)
+{
+  VALUE major, minor, micro;
+
+  rb_scan_args (argc, argv, "21", &major, &minor, &micro);
+
+  if (NIL_P (micro))
+    micro = UINT2NUM (0);
+
+  return CBOOL2RVAL (CAIRO_VERSION_MAJOR > NUM2UINT(major) ||
+                     (CAIRO_VERSION_MAJOR == NUM2UINT(major) &&
+                      CAIRO_VERSION_MINOR > NUM2UINT(minor)) ||
+                     (CAIRO_VERSION_MAJOR == NUM2UINT(major) &&
+                      CAIRO_VERSION_MINOR == NUM2UINT(minor) &&
+                      CAIRO_VERSION_MICRO >= NUM2UINT(micro)));
+}
+
 void
 Init_cairo ()
 {
@@ -58,7 +76,10 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (6), INT2FIX (1), Qnil));
+                                INT2FIX (1), INT2FIX (7), INT2FIX (0), Qnil));
+
+  rb_define_module_function (rb_mCairo, "satisfied_version?",
+                             rb_cairo_satisfied_version, -1);
 
   rb_mCairo_Color = rb_const_get (rb_mCairo, rb_intern ("Color"));
   rb_cCairo_Color_Base = rb_const_get (rb_mCairo_Color, rb_intern ("Base"));
@@ -79,4 +100,5 @@ Init_cairo ()
   Init_cairo_text_extents ();
   Init_cairo_pattern ();
   Init_cairo_glyph ();
+  Init_cairo_text_cluster ();
 }

data/src/rb_cairo.h

@@ -3,8 +3,9 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-11 03:01:33 $
+ * $Date: 2008-08-17 07:21:42 $
  *
+ * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -18,28 +19,18 @@
 
 #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
 
-#if CAIRO_HAS_WIN32_SURFACE
-#  define OpenFile OpenFile_win32
-#  include <cairo-win32.h>
-#  undef OpenFile
-#endif
-
-#if CAIRO_HAS_QUARTZ_SURFACE
-#  include <cairo-quartz.h>
-#endif
-
 #define CAIRO_CHECK_VERSION(major, minor, micro)    \
     (CAIRO_VERSION_MAJOR > (major) || \
      (CAIRO_VERSION_MAJOR == (major) && CAIRO_VERSION_MINOR > (minor)) || \
@@ -93,6 +84,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_GradientPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_LinearPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_RadialPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_FontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_ToyFontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace_TextToGlyphsData;
 RB_CAIRO_VAR VALUE rb_cCairo_FontExtents;
 RB_CAIRO_VAR VALUE rb_cCairo_FontOptions;
 RB_CAIRO_VAR VALUE rb_cCairo_ScaledFont;
@@ -129,6 +123,9 @@ RB_CAIRO_VAR VALUE rb_mCairo_PatternType;
 RB_CAIRO_VAR VALUE rb_mCairo_Extend;
 RB_CAIRO_VAR VALUE rb_mCairo_Filter;
 RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
+RB_CAIRO_VAR VALUE rb_mCairo_PSLevel;
+RB_CAIRO_VAR VALUE rb_mCairo_LCDFilter;
+RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
 RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 RB_CAIRO_VAR VALUE rb_cCairo_Paper;
@@ -164,6 +161,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 #define RVAL2CRGLYPH(obj)       (rb_cairo_glyph_from_ruby_object(obj))
 #define CRGLYPH2RVAL(glyph)     (rb_cairo_glyph_to_ruby_object(glyph))
 
+#define RVAL2CRTEXTCLUSTER(obj)     (rb_cairo_text_cluster_from_ruby_object(obj))
+#define CRTEXTCLUSTER2RVAL(cluster) (rb_cairo_text_cluster_to_ruby_object(cluster))
+
 #define RVAL2CRSURFACE(obj)     (rb_cairo_surface_from_ruby_object(obj))
 #define CRSURFACE2RVAL(surface) (rb_cairo_surface_to_ruby_object(surface))
 #define CRSURFACE2RVAL_WITH_DESTROY(surface) \
@@ -199,6 +199,11 @@ VALUE                 rb_cairo_text_extents_to_ruby_object   (cairo_text_extents
 cairo_glyph_t        *rb_cairo_glyph_from_ruby_object        (VALUE obj);
 VALUE                 rb_cairo_glyph_to_ruby_object          (cairo_glyph_t *glyph);
 
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+cairo_text_cluster_t *rb_cairo_text_cluster_from_ruby_object (VALUE obj);
+VALUE                 rb_cairo_text_cluster_to_ruby_object   (cairo_text_cluster_t *cluster);
+#endif
+
 cairo_surface_t      *rb_cairo_surface_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_surface_to_ruby_object        (cairo_surface_t *surface);
 VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
@@ -220,14 +225,17 @@ 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
 #endif
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+#define RVAL2CRLCDFILTER(obj)     (rb_cairo_lcd_filter_from_ruby_object(obj))
+#endif
 
 cairo_operator_t       rb_cairo_operator_from_ruby_object       (VALUE obj);
 cairo_antialias_t      rb_cairo_antialias_from_ruby_object      (VALUE obj);
@@ -244,14 +252,17 @@ 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
 #endif
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+cairo_lcd_filter_t     rb_cairo_lcd_filter_from_ruby_object     (VALUE obj);
+#endif
 
 void rb_cairo_check_status (cairo_status_t status);
 

data/src/rb_cairo_constants.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-04-04 04:25:16 $
+ * $Date: 2008-08-13 12:27:39 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -33,6 +33,7 @@ VALUE rb_mCairo_Extend;
 VALUE rb_mCairo_Filter;
 VALUE rb_mCairo_SVGVersion = Qnil;
 VALUE rb_mCairo_PSLevel = Qnil;
+VALUE rb_mCairo_LCDFilter = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
 #define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
@@ -85,6 +86,9 @@ VALUE rb_mCairo_PSLevel = Qnil;
 #define CAIRO_PS_LEVEL_MIN CAIRO_PS_LEVEL_2
 #define CAIRO_PS_LEVEL_MAX CAIRO_PS_LEVEL_3
 
+#define CAIRO_LCD_FILTER_MIN CAIRO_LCD_FILTER_DEFAULT
+#define CAIRO_LCD_FILTER_MAX CAIRO_LCD_FILTER_FIR5
+
 #define DEFINE_RVAL2ENUM(name, const_name)                      \
 cairo_ ## name ## _t                                            \
 rb_cairo_ ## name ## _from_ruby_object (VALUE rb_ ## name)      \
@@ -124,23 +128,31 @@ 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 CAIRO_CHECK_VERSION(1, 7, 2)
+DEFINE_RVAL2ENUM(lcd_filter, LCD_FILTER)
+#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 +199,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 +440,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 +454,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 +465,21 @@ 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
+
+#if CAIRO_CHECK_VERSION(1, 7, 2)
+  /* cairo_lcd_filter_t */
+  rb_mCairo_LCDFilter = rb_define_module_under (rb_mCairo, "LCDFilter");
+  rb_define_const (rb_mCairo_LCDFilter, "DEFAULT",
+                   INT2FIX (CAIRO_LCD_FILTER_DEFAULT));
+  rb_define_const (rb_mCairo_LCDFilter, "NONE",
+                   INT2FIX (CAIRO_LCD_FILTER_NONE));
+  rb_define_const (rb_mCairo_LCDFilter, "INTRA_PIXEL",
+                   INT2FIX (CAIRO_LCD_FILTER_INTRA_PIXEL));
+  rb_define_const (rb_mCairo_LCDFilter, "FIR3",
+                   INT2FIX (CAIRO_LCD_FILTER_FIR3));
+  rb_define_const (rb_mCairo_LCDFilter, "FIR5",
+                   INT2FIX (CAIRO_LCD_FILTER_FIR5));
 #endif
 }