cairo 1.12.9 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25726839fd4ba1f1c0a40c58b90d1de641eb863d
-  data.tar.gz: b6d811ef022e42990edebe58512740a21e9b1c3f
+  metadata.gz: 056d2172361d080d8adf08df91c556a493f46d99
+  data.tar.gz: af5ca3d7124cea7a8a288af32083247cfd06a188
 SHA512:
-  metadata.gz: 62656ab455331c397f0c98ba0fdceaff7729a08c20276a31190ca711fc6647c7e4f5887e6b81aec742f64e325a4909775cee17d978bd02fd8ab843c7494b5abb
-  data.tar.gz: 1501d2986b228891b410082e6f9c8446552cab09a48970fea6992615109b47da4e269099b877a1ac68e6a58e52a3a74b579e80a3f575ad55a96f3d390d87b147
+  metadata.gz: 0f0ceb6cd0bc3d2c7466070049bb7a659746ac3eafa616185e1aa74e2b892ae845465c45d4529604789541fbb49114c9b55a206a2e81c5041c1ff0c9bdf2c64d
+  data.tar.gz: db0d7ed817a5e7530130e60bf5b9d94f859ba8f272dbb4448f2a7b3d4197d34715635f90db17a589fe8334a3d8735cf078753d9b7f55f0b0a0cff3bba6ab91d3

data/NEWS

@@ -1,3 +1,29 @@
+Release 1.14.0 (2014-11-24) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Supported integration with ffi gem.
+    [GitHub#20][Patch by Patrick Hanevold]
+  * Supported cairo 1.14.0.
+    [GitHub#24][GitHub#25][GitHub#28][GitHub#30][Patch by Hiroshi Hatake]
+  * Added libstdc++-6.dll into gem for Windows.
+
+Fixes
+-----
+
+  * Fixed an build error on Cygwin.
+    [GitHub#19][Reported by Patrick Hanevold][Patch by Masafumi Yokoyama]
+    [ruby-gnome2-devel-en][Reported by Detlef Reichl]
+
+Thanks
+------
+
+  * Patrick Hanevold
+  * Masafumi Yokoyama
+  * Hiroshi Hatake
+
 Release 1.12.9 (2014-04-05) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/README.rdoc

@@ -12,7 +12,7 @@ http://cairographics.org/
 
 == Dependencies
 
-* ruby >= 1.9.3 (2.0.0 also supported!)
+* ruby >= 1.9.3 (2.2 also supported!)
 * cairo >= 1.2.0 (1.12.0 also supported!)
 
 == Install
@@ -38,11 +38,11 @@ Compiling:
   % make               # to compile
 
   # make install       # to install the cairo extension.
-		       # The samples in the samples folder should be able
-		       # to run before installation except text-on-path.rb
-		       # and text2.rb. They uses Ruby/Pango with rcairo
-		       # support. So you need to install rcairo and build
-		       # Ruby/Pango with it before you run them.
+                       # The samples in the samples folder should be able
+                       # to run before installation except text-on-path.rb
+                       # and text2.rb. They uses Ruby/Pango with rcairo
+                       # support. So you need to install rcairo and build
+                       # Ruby/Pango with it before you run them.
 
 Options to extconf.rb:
 
@@ -67,7 +67,7 @@ cairo-X.Y.Z-x86-mingw32.gem includes cairo related binaries.
 == Documents
 
 * Reference manual:
-  http://cairo.rubyforge.org/doc/
+  http://rcairo.github.io/doc/
 * Repository of the reference manual:
   http://github.com/rcairo/doc
 * An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):

data/Rakefile

@@ -1,21 +1,21 @@
 # -*- coding: utf-8; mode: ruby -*-
 
-require 'English'
-
-require 'find'
-require 'fileutils'
-require 'open-uri'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'yard'
-require 'bundler/gem_helper'
-require 'rake/extensiontask'
-require 'packnga'
+require "English"
+
+require "find"
+require "fileutils"
+require "open-uri"
+require "rubygems"
+require "rubygems/package_task"
+require "yard"
+require "bundler/gem_helper"
+require "rake/extensiontask"
+require "packnga"
 
 base_dir = File.join(File.dirname(__FILE__))
 
-cairo_ext_dir = File.join(base_dir, 'ext', 'cairo')
-cairo_lib_dir = File.join(base_dir, 'lib')
+cairo_ext_dir = File.join(base_dir, "ext", "cairo")
+cairo_lib_dir = File.join(base_dir, "lib")
 $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
@@ -29,6 +29,8 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 Packnga::DocumentTask.new(spec) do |task|
+  task.original_language = "en"
+  task.translate_languages = ["ja"]
 end
 
 Packnga::ReleaseTask.new(spec) do |task|
@@ -198,9 +200,21 @@ class WindowsTask
           directory binary_path.to_s
           desc "Bundle GCC related DLLs"
           task :bundle => binary_path do
-            dll_names = ["libgcc_s_sjlj-1.dll", "libwinpthread-1.dll"]
+            dll_names = [
+              "libstdc++-6.dll",
+              "libwinpthread-1.dll",
+              "libgcc_s_sjlj-1.dll",
+              "libgcc_s_seh-1.dll",
+            ]
             dll_names.each do |dll_name|
-              cp(absolete_gcc_dll_path(dll_name), binary_path)
+              destination_path = binary_path + dll_name
+              dll_path = absolete_gcc_dll_path(dll_name)
+              unless File.exist?(dll_path)
+                puts("#{dll_name} doesn't exist.")
+                next
+              end
+              cp(dll_path, destination_path)
+              chmod(0755, destination_path)
             end
           end
         end
@@ -235,6 +249,7 @@ class WindowsTask
   end
 
   def download(package, archive_path)
+    rake_output_message "Downloading... #{package.archive_url}"
     open(package.archive_url) do |downloaded_archive|
       begin
         archive_path.open("wb") do |archive_file|
@@ -435,8 +450,8 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.10",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.10",
+      :version => "1.6.14",
+      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
@@ -452,7 +467,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libxml2",
-      :version => "2.9.1",
+      :version => "2.9.2",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -460,6 +475,10 @@ windows_task = WindowsTask.new(spec) do |task|
         :configure_args => [
           "--without-python",
         ],
+        :patches => [
+          "remove-empty-z_dir-ldflags.diff",
+        ],
+        :need_autoreconf => true,
       },
     },
     {
@@ -481,7 +500,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "pixman",
-      :version => "0.32.4",
+      :version => "0.32.6",
       :download_site => :cairo,
       :compression_method => "gz",
       :windows => {
@@ -490,13 +509,17 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.12.16",
+      :version => "1.14.0",
       :download_site => :cairo,
       :windows => {
         :built_file => "bin/libcairo-2.dll",
         :configure_args => [
           "--enable-gobject",
         ],
+        :patches => [
+          "cairo-1.14-missing-exeext-float-m4.diff"
+        ],
+        :need_autoreconf => true,
       },
     },
   ]
@@ -581,3 +604,17 @@ langs.each do |lang,|
     rm Dir[File.join(lang_doc_dir, "*.{rd,rdc,rbl}")]
   end
 end
+
+file "Makefile" => ["extconf.rb", "ext/cairo/extconf.rb"] do
+  ruby("extconf.rb")
+end
+
+desc "Configure"
+task :configure => "Makefile"
+
+desc "Run test"
+task :test => :configure do
+  ruby("test/run-test.rb")
+end
+
+task :default => :test

data/ext/cairo/extconf.rb

@@ -29,13 +29,13 @@ major, minor, micro = 1, 2, 0
 base_dir = Pathname(__FILE__).dirname.parent.parent
 checking_for(checking_message("Win32 OS")) do
   case RUBY_PLATFORM
-  when /cygwin|mingw|mswin32/
+  when /mingw|mswin32/
     $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    if with_config('vendor-override', true)
-      binary_base_dir = base_dir + "vendor" + "local"
+    binary_base_dir = base_dir + "vendor" + "local"
+    if with_config('vendor-override', binary_base_dir.exist?)
       $CFLAGS += " -I#{binary_base_dir}/include"
       pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
       PKGConfig.add_path(pkg_config_dir.to_s)

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2014 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -72,8 +72,8 @@ RB_CAIRO_BEGIN_DECLS
 #endif
 
 #define RB_CAIRO_VERSION_MAJOR 1
-#define RB_CAIRO_VERSION_MINOR 12
-#define RB_CAIRO_VERSION_MICRO 9
+#define RB_CAIRO_VERSION_MINOR 14
+#define RB_CAIRO_VERSION_MICRO 0
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_constants.c

@@ -651,6 +651,14 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_MimeType, "UNIQUE_ID",
                    rb_str_new2 (CAIRO_MIME_TYPE_UNIQUE_ID));
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  rb_define_const (rb_mCairo_MimeType, "JBIG2",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2));
+  rb_define_const (rb_mCairo_MimeType, "JBIG2_GLOBAL",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2_GLOBAL));
+  rb_define_const (rb_mCairo_MimeType, "JBIG2_GLOBAL_ID",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID));
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
   rb_mCairo_RegionOverlap = rb_define_module_under (rb_mCairo, "RegionOverlap");

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -129,6 +129,51 @@ cr_destroy_with_destroy_check (VALUE self)
   return Qnil;
 }
 
+static VALUE
+cr_s_wrap (VALUE self, VALUE pointer)
+{
+  VALUE result;
+  VALUE rb_cr;
+  cairo_t *cr;
+
+  if (NIL_P (rb_cairo__cFFIPointer))
+    {
+      rb_raise (rb_eNotImpError,
+                "%s: FFI::Pointer is required",
+                rb_id2name (rb_frame_this_func ()));
+    }
+
+  if (!RTEST (rb_obj_is_kind_of (pointer, rb_cairo__cFFIPointer)))
+    {
+      rb_raise (rb_eArgError,
+                "must be FFI::Pointer: %s",
+                rb_cairo__inspect (pointer));
+    }
+
+  {
+    VALUE rb_cr_address;
+    rb_cr_address = rb_funcall (pointer, rb_intern ("address"), 0);
+    cr = NUM2PTR (rb_cr_address);
+    cr_check_status (cr);
+  }
+
+  rb_cr = rb_obj_alloc (self);
+  cairo_reference (cr);
+  DATA_PTR (rb_cr) = cr;
+  rb_ivar_set (rb_cr, cr_id_surface, Qnil);
+
+  if (rb_block_given_p ())
+    {
+      result = rb_ensure (rb_yield, rb_cr, cr_destroy_with_destroy_check, rb_cr);
+    }
+  else
+    {
+      result = rb_cr;
+    }
+
+  return result;
+}
+
 static VALUE
 cr_initialize (VALUE self, VALUE target)
 {
@@ -138,6 +183,7 @@ cr_initialize (VALUE self, VALUE target)
   cr = cairo_create (RVAL2CRSURFACE (target));
   cr_check_status (cr);
   rb_ivar_set (self, cr_id_surface, target);
+  rb_ivar_set (self, cr_id_source, Qnil);
   if (rb_ivar_defined (target, rb_cairo__io_id_output))
     cr_set_user_data (cr,
                       &cr_object_holder_key,
@@ -149,6 +195,17 @@ cr_initialize (VALUE self, VALUE target)
   return result;
 }
 
+static VALUE
+cr_to_ptr (VALUE self)
+{
+  if (NIL_P (rb_cairo__cFFIPointer))
+    return Qnil;
+
+  return rb_funcall (rb_cairo__cFFIPointer, rb_intern ("new"),
+                     1, PTR2NUM (_SELF));
+}
+
+
 static VALUE
 cr_restore (VALUE self)
 {
@@ -1526,6 +1583,9 @@ Init_cairo_context (void)
   rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Context);
   rb_set_end_proc(cr_destroy_all_guarded_contexts_at_end, Qnil);
 
+  /* For integrate other libraries such as a FFI based library. */
+  rb_define_singleton_method (rb_cCairo_Context, "wrap", cr_s_wrap, 1);
+
   /* Functions for manipulating state objects */
   rb_define_method (rb_cCairo_Context, "initialize", cr_initialize, 1);
   rb_define_method (rb_cCairo_Context, "destroy", cr_destroy, 0);
@@ -1675,5 +1735,7 @@ Init_cairo_context (void)
   rb_define_method (rb_cCairo_Context, "copy_path_flat", cr_copy_path_flat, 0);
   rb_define_method (rb_cCairo_Context, "append_path", cr_copy_append_path, 1);
 
+  rb_define_method (rb_cCairo_Context, "to_ptr", cr_to_ptr, 0);
+
   RB_CAIRO_DEF_SETTERS (rb_cCairo_Context);
 }

data/ext/cairo/rb_cairo_exception.c

@@ -61,6 +61,9 @@ static VALUE rb_eCairo_DeviceError;
 static VALUE rb_eCairo_InvalidMeshConstruction;
 static VALUE rb_eCairo_DeviceFinished;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+static VALUE rb_eCairo_JBIG2GlobalMissing;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -192,6 +195,11 @@ rb_cairo_check_status (cairo_status_t status)
       rb_raise (rb_eCairo_DeviceFinished, "%s", string);
       break;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+    case CAIRO_STATUS_JBIG2_GLOBAL_MISSING:
+      rb_raise (rb_eCairo_JBIG2GlobalMissing, "%s", string);
+      break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
     case CAIRO_STATUS_LAST_STATUS:
 #else
@@ -285,6 +293,10 @@ rb_cairo__exception_to_status (VALUE exception)
   else if (rb_cairo__is_kind_of (exception, rb_eCairo_DeviceError))
     return CAIRO_STATUS_DEVICE_ERROR;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  else if (rb_cairo__is_kind_of (exception, rb_eCairo_JBIG2GlobalMissing))
+    return CAIRO_STATUS_JBIG2_GLOBAL_MISSING;
+#endif
 
   return -1;
 }
@@ -426,4 +438,9 @@ Init_cairo_exception ()
     rb_define_class_under (rb_mCairo, "DeviceFinished",
                            rb_eCairo_Error);
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  rb_eCairo_JBIG2GlobalMissing =
+    rb_define_class_under (rb_mCairo, "JBIG2GlobalMissing",
+                           rb_eCairo_Error);
+#endif
 }

data/ext/cairo/rb_cairo_font_face.c

@@ -111,6 +111,16 @@ cr_font_face_allocate (VALUE klass)
   return Data_Wrap_Struct (klass, NULL, cr_font_face_free, NULL);
 }
 
+static VALUE
+cr_font_face_quartz_supported_p (VALUE klass)
+{
+#ifdef CAIRO_HAS_QUARTZ_FONT
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 static VALUE
 cr_toy_font_face_initialize (int argc, VALUE *argv, VALUE self)
@@ -652,6 +662,9 @@ Init_cairo_font (void)
     rb_define_class_under (rb_mCairo, "FontFace", rb_cObject);
   rb_define_alloc_func (rb_cCairo_FontFace, cr_font_face_allocate);
 
+  rb_define_singleton_method (rb_cCairo_FontFace, "quartz_supported?",
+                              cr_font_face_quartz_supported_p, 0);
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
   rb_cCairo_ToyFontFace =
     rb_define_class_under (rb_mCairo, "ToyFontFace", rb_cCairo_FontFace);

data/ext/cairo/rb_cairo_private.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -14,6 +14,8 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
+VALUE rb_cairo__cFFIPointer;
+
 static ID cr_id_normalize_const_name;
 static ID cr_id_objects;
 static ID cr_id_dup;
@@ -239,4 +241,15 @@ Init_cairo_private (void)
   cr_id_dup = rb_intern ("dup");
   cr_id_inspect = rb_intern ("inspect");
   cr_id_exit_application = rb_intern ("exit_application");
+
+  if (rb_const_defined (rb_cObject, rb_intern ("FFI")))
+    {
+      rb_cairo__cFFIPointer =
+        rb_const_get (rb_const_get (rb_cObject, rb_intern ("FFI")),
+                      rb_intern ("Pointer"));
+    }
+  else
+    {
+      rb_cairo__cFFIPointer = Qnil;
+    }
 }

data/ext/cairo/rb_cairo_private.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -43,6 +43,15 @@
 #  define RB_ERRINFO (ruby_errinfo)
 #endif
 
+/* from dl/dl.h (ruby 1.9) */
+#if SIZEOF_LONG == SIZEOF_VOIDP
+#  define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
+#  define NUM2PTR(x)   ((void *)(NUM2ULONG(x)))
+#else
+#  define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
+#  define NUM2PTR(x)   ((void *)(NUM2ULL(x)))
+#endif
+
 extern void Init_cairo_private (void);
 extern void Init_cairo_io (void);
 extern void Init_cairo_constants (void);
@@ -115,4 +124,6 @@ cairo_status_t rb_cairo__exception_to_status (VALUE exception);
 typedef VALUE (*cr_callback_func_t) (VALUE user_data);
 VALUE rb_cairo__invoke_callback (cr_callback_func_t func, VALUE user_data);
 
+extern VALUE rb_cairo__cFFIPointer;
+
 #endif

data/ext/cairo/rb_cairo_surface.c

@@ -54,7 +54,8 @@ enum ruby_value_type {
 #  include <cairo-quartz.h>
 #  define T_DATA RUBY_T_DATA
 #  define RB_CAIRO_HAS_QUARTZ_SURFACE
-#  ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TYPE
+#  ifdef CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+#    include <cairo-quartz-image.h>
 #    define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
 #  endif
 #endif
@@ -829,6 +830,27 @@ cr_surface_get_device_offset (VALUE self)
   return rb_ary_new3 (2, rb_float_new (x_offset), rb_float_new (y_offset));
 }
 
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+static VALUE
+cr_surface_set_device_scale (VALUE self, VALUE x_scale, VALUE y_scale)
+{
+  cairo_surface_set_device_scale (_SELF,
+                                  NUM2DBL (x_scale),
+                                  NUM2DBL (y_scale));
+  cr_surface_check_status (_SELF);
+  return self;
+}
+
+static VALUE
+cr_surface_get_device_scale (VALUE self)
+{
+  double x_scale, y_scale;
+
+  cairo_surface_get_device_scale (_SELF, &x_scale, &y_scale);
+  return rb_ary_new3 (2, rb_float_new (x_scale), rb_float_new (y_scale));
+}
+#endif
+
 static VALUE
 cr_surface_set_fallback_resolution (VALUE self,
                                     VALUE x_pixels_per_inch,
@@ -1199,8 +1221,10 @@ cr_ps_surface_set_eps (VALUE self, VALUE eps)
 /* Quartz-surface functions */
 #include <objc/objc-runtime.h>
 
+#  ifdef HAVE_RUBY_COCOA
 BOOL rbobj_to_nsobj (VALUE obj, id* nsobj);
 VALUE ocid_to_rbobj (VALUE context_obj, id ocid);
+#  endif
 
 static VALUE
 cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
@@ -1211,10 +1235,9 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
   cairo_surface_t *surface = NULL;
   cairo_format_t format = CAIRO_FORMAT_ARGB32;
   VALUE arg1, arg2, arg3, rb_width, rb_height;
-#ifdef HAVE_RUBY_COCOA
+#  ifdef HAVE_RUBY_COCOA
   static VALUE rb_cOSXCGContextRef = Qnil;
-#endif
-  static VALUE rb_cFFIPointer = Qnil;
+#  endif
 
   rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
 
@@ -1235,27 +1258,23 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
           format = RVAL2CRFORMAT (arg1);
           break;
         default:
-#ifdef HAVE_RUBY_COCOA
+#  ifdef HAVE_RUBY_COCOA
           if (NIL_P (rb_cOSXCGContextRef))
             rb_cOSXCGContextRef =
               rb_const_get (rb_const_get (rb_cObject, rb_intern ("OSX")),
                             rb_intern ("CGContextRef"));
-#endif
-
-          if (NIL_P (rb_cFFIPointer))
-            rb_cFFIPointer =
-              rb_const_get (rb_const_get (rb_cObject, rb_intern ("FFI")),
-                            rb_intern ("Pointer"));
+#  endif
 
-#ifdef HAVE_RUBY_COCOA
+#  ifdef HAVE_RUBY_COCOA
           if (RTEST (rb_obj_is_kind_of (arg1, rb_cOSXCGContextRef)))
             {
               rbobj_to_nsobj (arg1, &objc_object);
             }
           else
-#endif
+#  endif
             {
-              if (RTEST (rb_obj_is_kind_of (arg1, rb_cFFIPointer)))
+              if (!NIL_P (rb_cairo__cFFIPointer) &&
+                  RTEST (rb_obj_is_kind_of (arg1, rb_cairo__cFFIPointer)))
                 {
                   VALUE rb_objc_pointer;
                   rb_objc_pointer = rb_funcall (arg1,
@@ -1305,27 +1324,25 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
 static VALUE
 cr_quartz_surface_get_cg_context (VALUE self)
 {
+#  ifdef HAVE_RUBY_COCOA
   CGContextRef context;
   id objc_object;
 
   context = cairo_quartz_surface_get_cg_context (_SELF);
   objc_object = (id)context;
   return ocid_to_rbobj (Qnil, objc_object);
+#  else
+  rb_raise (rb_eNotImpError,
+            "%s#cg_context requires RubyCocoa",
+            rb_obj_classname(self));
+  return Qnil;
+#  endif
 }
 #endif
 
 #ifdef CAIRO_HAS_WIN32_SURFACE
 /* Win32 surface functions */
 
-/* from dl/dl.h (ruby 1.9) */
-#  if SIZEOF_LONG == SIZEOF_VOIDP
-#    define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
-#    define NUM2PTR(x)   ((void *)(NUM2ULONG(x)))
-#  else
-#    define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
-#    define NUM2PTR(x)   ((void *)(NUM2ULL(x)))
-#  endif
-
 static VALUE
 cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
 {
@@ -1467,6 +1484,7 @@ cr_win32_printing_surface_initialize (VALUE self, VALUE hdc)
 #endif
 
 #ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+
 /* Quartz image surface functions */
 static VALUE
 cr_quartz_image_surface_initialize (VALUE self, VALUE image_surface)
@@ -2005,6 +2023,12 @@ Init_cairo_surface (void)
                     cr_surface_set_device_offset, 2);
   rb_define_method (rb_cCairo_Surface, "device_offset",
                     cr_surface_get_device_offset, 0);
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  rb_define_method (rb_cCairo_Surface, "set_device_scale",
+                    cr_surface_set_device_scale, 2);
+  rb_define_method (rb_cCairo_Surface, "device_scale",
+                    cr_surface_get_device_scale, 0);
+#endif
   rb_define_method (rb_cCairo_Surface, "set_fallback_resolution",
                     cr_surface_set_fallback_resolution, 2);
 #if CAIRO_CHECK_VERSION(1, 7, 2)

data/lib/cairo/surface.rb

@@ -2,7 +2,9 @@ module Cairo
   class Surface
     class << self
       def supported?(type)
-        supported_predicate = "#{type.to_s.downcase}_supported?"
+        type_components = type.to_s.split(/([A-Z][a-z\d]+)/).reject(&:empty?)
+        snake_case_type_name = type_components.join("_").downcase
+        supported_predicate = "#{snake_case_type_name}_supported?"
         return false unless respond_to?(supported_predicate)
         send(supported_predicate)
       end

data/test/cairo-test-utils.rb

@@ -1,5 +1,6 @@
 require 'cairo'
 require 'stringio'
+require 'test/unit/notify'
 
 module CairoTestUtils
   private
@@ -17,6 +18,10 @@ module CairoTestUtils
     /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM) ? true : false
   end
 
+  def quartz?
+    Cairo::FontFace.quartz_supported?
+  end
+
   def only_device(name)
     only_cairo_version(1, 10)
 

data/test/test_constants.rb

@@ -13,4 +13,15 @@ class ConstantsTest < Test::Unit::TestCase
                  [0,
                   Cairo::TextClusterFlag::BACKWARD])
   end
+
+  def test_new_constants_since_1_14_0
+    if Cairo.satisfied_version?(1, 14, 0)
+      assertion = :assert_const_defined
+    else
+      assertion = :assert_not_const_defined
+    end
+    send(assertion, Cairo::MimeType, :JBIG2)
+    send(assertion, Cairo::MimeType, :JBIG2_GLOBAL)
+    send(assertion, Cairo::MimeType, :JBIG2_GLOBAL_ID)
+  end
 end

data/test/test_context.rb

@@ -73,7 +73,7 @@ class ContextTest < Test::Unit::TestCase
 
     face = context.font_face
     default_font_family = ""
-    # default_font_family = "Helvetica" if quartz?
+    default_font_family = "Helvetica" if quartz?
     default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,

data/test/test_exception.rb

@@ -16,6 +16,15 @@ class ExceptionTest < Test::Unit::TestCase
     send(assertion, "InvalidWeight")
   end
 
+  def test_new_symbols_since_1_14_0
+    if Cairo.satisfied_version?(1, 14, 0)
+      assertion = :assert_defined
+    else
+      assertion = :assert_not_defined
+    end
+    send(assertion, "JBIG2GlobalMissing")
+  end
+
   private
   def assert_defined(name)
     assert_true(Cairo.const_defined?(name))

data/test/test_font_face.rb

@@ -8,7 +8,7 @@ class FontFaceTest < Test::Unit::TestCase
 
     face = Cairo::ToyFontFace.new
     default_font_family = ""
-    # default_font_family = "Helvetica" if quartz?
+    default_font_family = "Helvetica" if quartz?
     default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,

data/test/test_quartz_image_surface.rb

@@ -0,0 +1,13 @@
+class QuartzImageSurfaceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def setup
+    only_surface("QuartzImage")
+  end
+
+  def test_quartz_image_surface
+    surface = Cairo::ImageSurface.new(100, 100)
+    quartz_surface = Cairo::QuartzImageSurface.new(surface)
+    assert_kind_of(Cairo::QuartzImageSurface, quartz_surface)
+  end
+end

data/test/test_surface.rb

@@ -28,6 +28,16 @@ class SurfaceTest < Test::Unit::TestCase
     end
   end
 
+  def test_device_scale
+    only_cairo_version(1, 14, 0)
+    surface = Cairo::ImageSurface.new(100, 100)
+
+    assert_equal([1.0, 1.0], surface.device_scale)
+
+    surface.set_device_scale(3.0, 4.0)
+    assert_equal([3.0, 4.0], surface.device_scale)
+  end
+
   def test_fallback_resolution
     only_cairo_version(1, 7, 2)
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.12.9
+  version: 1.14.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings for cairo
@@ -95,84 +95,85 @@ files:
 - Gemfile
 - NEWS
 - README.rdoc
-- ext/cairo/extconf.rb
 - Rakefile
+- ext/cairo/cairo.def
+- ext/cairo/depend
+- ext/cairo/extconf.rb
+- ext/cairo/rb_cairo.c
+- ext/cairo/rb_cairo.h
+- ext/cairo/rb_cairo_constants.c
+- ext/cairo/rb_cairo_context.c
+- ext/cairo/rb_cairo_device.c
+- ext/cairo/rb_cairo_exception.c
+- ext/cairo/rb_cairo_font_extents.c
+- ext/cairo/rb_cairo_font_face.c
+- ext/cairo/rb_cairo_font_options.c
+- ext/cairo/rb_cairo_glyph.c
+- ext/cairo/rb_cairo_io.c
+- ext/cairo/rb_cairo_io.h
+- ext/cairo/rb_cairo_matrix.c
+- ext/cairo/rb_cairo_path.c
+- ext/cairo/rb_cairo_pattern.c
+- ext/cairo/rb_cairo_private.c
+- ext/cairo/rb_cairo_private.h
+- ext/cairo/rb_cairo_rectangle.c
+- ext/cairo/rb_cairo_region.c
+- ext/cairo/rb_cairo_scaled_font.c
+- ext/cairo/rb_cairo_surface.c
+- ext/cairo/rb_cairo_text_cluster.c
+- ext/cairo/rb_cairo_text_extents.c
 - lib/cairo.rb
-- lib/cairo/device.rb
-- lib/cairo/path.rb
-- lib/cairo/context/triangle.rb
-- lib/cairo/context/path.rb
+- lib/cairo/color.rb
+- lib/cairo/colors.rb
+- lib/cairo/constants.rb
+- lib/cairo/context.rb
+- lib/cairo/context/blur.rb
 - lib/cairo/context/circle.rb
 - lib/cairo/context/color.rb
-- lib/cairo/context/blur.rb
+- lib/cairo/context/path.rb
 - lib/cairo/context/rectangle.rb
-- lib/cairo/context.rb
+- lib/cairo/context/triangle.rb
+- lib/cairo/device.rb
 - lib/cairo/paper.rb
-- lib/cairo/color.rb
-- lib/cairo/constants.rb
-- lib/cairo/surface.rb
-- lib/cairo/colors.rb
-- lib/cairo/point.rb
-- lib/cairo/pattern.rb
 - lib/cairo/papers.rb
+- lib/cairo/path.rb
+- lib/cairo/pattern.rb
+- lib/cairo/point.rb
+- lib/cairo/surface.rb
+- samples/agg/aa_test.rb
+- samples/blur.rb
+- samples/pac-nomralize.rb
+- samples/pac-tee.rb
 - samples/pac.rb
 - samples/png.rb
-- samples/pac-tee.rb
 - samples/scalable.rb
-- samples/pac-nomralize.rb
 - samples/text-on-path.rb
-- samples/blur.rb
-- samples/agg/aa_test.rb
 - samples/text2.rb
-- ext/cairo/cairo.def
-- ext/cairo/depend
-- ext/cairo/rb_cairo_surface.c
-- ext/cairo/rb_cairo_scaled_font.c
-- ext/cairo/rb_cairo_font_options.c
-- ext/cairo/rb_cairo_font_face.c
-- ext/cairo/rb_cairo_region.c
-- ext/cairo/rb_cairo_io.c
-- ext/cairo/rb_cairo_path.c
-- ext/cairo/rb_cairo_exception.c
-- ext/cairo/rb_cairo_font_extents.c
-- ext/cairo/rb_cairo_context.c
-- ext/cairo/rb_cairo.c
-- ext/cairo/rb_cairo_text_cluster.c
-- ext/cairo/rb_cairo_text_extents.c
-- ext/cairo/rb_cairo_pattern.c
-- ext/cairo/rb_cairo_private.c
-- ext/cairo/rb_cairo_matrix.c
-- ext/cairo/rb_cairo_glyph.c
-- ext/cairo/rb_cairo_rectangle.c
-- ext/cairo/rb_cairo_constants.c
-- ext/cairo/rb_cairo_device.c
-- ext/cairo/rb_cairo.h
-- ext/cairo/rb_cairo_io.h
-- ext/cairo/rb_cairo_private.h
-- test/test_text_extents.rb
-- test/test_font_face.rb
-- test/test_region.rb
+- test/cairo-test-utils.rb
+- test/run-test.rb
+- test/test_color.rb
+- test/test_constants.rb
+- test/test_context.rb
 - test/test_exception.rb
 - test/test_font_extents.rb
-- test/test_scaled_font.rb
+- test/test_font_face.rb
+- test/test_font_options.rb
+- test/test_image_surface.rb
 - test/test_paper.rb
-- test/test_tee_surface.rb
-- test/test_text_to_glyphs_data.rb
-- test/test_constants.rb
-- test/test_script_surface.rb
-- test/run-test.rb
-- test/test_xml_device.rb
+- test/test_quartz_image_surface.rb
+- test/test_raster_source_pattern.rb
 - test/test_recording_surface.rb
-- test/test_color.rb
+- test/test_region.rb
+- test/test_scaled_font.rb
+- test/test_script_device.rb
+- test/test_script_surface.rb
 - test/test_surface.rb
+- test/test_tee_surface.rb
 - test/test_text_cluster.rb
-- test/cairo-test-utils.rb
-- test/test_font_options.rb
-- test/test_context.rb
-- test/test_script_device.rb
+- test/test_text_extents.rb
+- test/test_text_to_glyphs_data.rb
+- test/test_xml_device.rb
 - test/test_xml_surface.rb
-- test/test_raster_source_pattern.rb
-- test/test_image_surface.rb
 homepage: http://cairographics.org/rcairo
 licenses:
 - Ruby's
@@ -183,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cairo
-rubygems_version: 2.0.14
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for cairo
@@ -216,6 +217,7 @@ test_files:
 - test/test_surface.rb
 - test/test_text_cluster.rb
 - test/cairo-test-utils.rb
+- test/test_quartz_image_surface.rb
 - test/test_font_options.rb
 - test/test_context.rb
 - test/test_script_device.rb