cairo 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0773e780836adfd202d91fbb4a1bfde4efd58af
-  data.tar.gz: 01bcd8c5a152a49903bd74149c822bb5dd70f50c
+  metadata.gz: 5d6352c8474409a3dc77b667c482f645d9f6eb6e
+  data.tar.gz: 3a756185b5816b5a8c11951835fc7cb5115ffd70
 SHA512:
-  metadata.gz: e8e1d7d8ff8b80736801e4eb70cec7e74295983626cee2511b642c81d1072337cc0a45b2b1095f4e74f9fa96f93da9b6aa7d7e4486a7b4c618e8a2fa270c13e5
-  data.tar.gz: 7d7d46709d0d4d097ea7361c1dbb5a4cb2f15f93818706b6a12720f14cac237a41f7b3db54cd65efd36225a04498753e0a5adb1fd061f3cdb8a161378cb919fb
+  metadata.gz: 08c3ee47ccb9e4ca12d9577f51ec49028581151576c5f83711fa9d4564832bcb89f501b7e557147d5a795856dedb25bf11356858419bb55c24554dce8226ce75
+  data.tar.gz: 81828f7139acf3d451aed3f3f95ee50343d289e1a21320be756e236e61364a8d1a8914cbadc409cba43901f28e790cd1363b3a6f3a8c5c6e42da93c90a18abe5

data/NEWS

@@ -1,3 +1,17 @@
+Release 1.14.3 (2015-09-08) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Fixes
+-----
+
+ * Fixed run-time error on OS X.
+   [shocker-ja:1270][Reported by Junichi Oya]
+
+Thanks
+------
+
+ * Junichi Oya
+
 Release 1.14.2 (2015-09-06) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -527,13 +527,25 @@ windows_task.define
 
 namespace :vm do
   namespace :windows do
-    desc "Build all packages for Windows in VM"
-    task :build do
-      cd("build") do
-        sh("vagrant", "destroy", "--force")
-        sh("vagrant", "up")
+    architectures = ["32", "64"]
+    build_tasks = []
+
+    namespace :build do
+      architectures.each do |architecture|
+        desc "Build all packages for Windows #{architecture}"
+        task_name = "win#{architecture}"
+        build_tasks << task_name
+        task task_name do
+          cd("build") do
+            sh("vagrant", "destroy", "--force", task_name)
+            sh("vagrant", "up", task_name)
+          end
+        end
       end
     end
+
+    desc "Build all packages for Windows"
+    task :build => build_tasks
   end
 end
 

data/ext/cairo/extconf.rb

@@ -199,8 +199,6 @@ checking_for(checking_message("Mac OS X")) do
     end
     true
   else
-    MakeMakefile::C_EXT.delete("m")
-    MakeMakefile::SRC_EXT.delete("m")
     false
   end
 end

data/ext/cairo/rb_cairo.c

@@ -99,9 +99,7 @@ Init_cairo ()
   Init_cairo_region ();
   Init_cairo_device ();
   Init_cairo_surface ();
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
   Init_cairo_quartz_surface ();
-#endif
   Init_cairo_exception ();
   Init_cairo_font ();
   Init_cairo_font_extents ();

data/ext/cairo/rb_cairo.h

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

data/ext/cairo/rb_cairo_quartz_surface.c

@@ -0,0 +1,207 @@
+/* -*- mode: objc; c-file-style: "gnu"; indent-tabs-mode: nil -*- */
+/*
+ * Ruby Cairo Binding
+ *
+ * Copyright 2008-2015 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
+ *
+ * This file is made available under the same terms as Ruby
+ *
+ */
+
+#include "rb_cairo.h"
+#include "rb_cairo_private.h"
+
+#if CAIRO_CHECK_VERSION(1, 5, 12)
+#  define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TYPE
+#endif
+
+#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#  ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
+enum ruby_value_type {
+  RUBY_T_DATA = T_DATA
+};
+#  endif
+#  undef T_DATA
+#  include <cairo-quartz.h>
+#  define T_DATA RUBY_T_DATA
+#  define RB_CAIRO_HAS_QUARTZ_SURFACE
+#  ifdef CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+#    include <cairo-quartz-image.h>
+#    define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+#  endif
+#endif
+
+#define _SELF  (RVAL2CRSURFACE(self))
+
+#ifdef RB_CAIRO_HAS_QUARTZ_SURFACE
+/* 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)
+{
+  id objc_object = nil;
+  CGContextRef context;
+  unsigned int width, height;
+  cairo_surface_t *surface = NULL;
+  cairo_format_t format = CAIRO_FORMAT_ARGB32;
+  VALUE arg1, arg2, arg3, rb_width, rb_height;
+#  ifdef HAVE_RUBY_COCOA
+  static VALUE rb_cOSXCGContextRef = Qnil;
+#  endif
+
+  rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
+
+  if (argc == 2)
+    {
+      rb_width = arg1;
+      rb_height = arg2;
+    }
+  else
+    {
+      switch (TYPE (arg1))
+        {
+        case T_NIL:
+          break;
+        case T_STRING:
+        case T_SYMBOL:
+        case T_FIXNUM:
+          format = RVAL2CRFORMAT (arg1);
+          break;
+        default:
+#  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
+
+#  ifdef HAVE_RUBY_COCOA
+          if (RTEST (rb_obj_is_kind_of (arg1, rb_cOSXCGContextRef)))
+            {
+              rbobj_to_nsobj (arg1, &objc_object);
+            }
+          else
+#  endif
+            {
+              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,
+                                                rb_intern ("address"),
+                                                0);
+                  objc_object = (id) NUM2ULONG (rb_objc_pointer);
+                }
+              else
+                {
+                  rb_raise (rb_eArgError,
+                            "invalid argument (expect "
+                            "(width, height), "
+                            "(format, width, height), "
+                            "(cg_context, width, height) or "
+                            "(ffi_pointer, width, height)): %s",
+                            rb_cairo__inspect (rb_ary_new3 (3, arg1, arg2, arg3)));
+                }
+            }
+          break;
+        }
+
+      rb_width = arg2;
+      rb_height = arg3;
+    }
+
+  width = NUM2UINT (rb_width);
+  height = NUM2UINT (rb_height);
+
+  if (objc_object == nil)
+    {
+      surface = cairo_quartz_surface_create (format, width, height);
+    }
+  else
+    {
+      context = (CGContextRef)objc_object;
+      surface =
+        cairo_quartz_surface_create_for_cg_context (context, width, height);
+    }
+
+  rb_cairo_surface_check_status (surface);
+  DATA_PTR (self) = surface;
+  if (rb_block_given_p ())
+    rb_cairo__surface_yield_and_finish (self);
+  return Qnil;
+}
+
+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 RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+
+/* Quartz image surface functions */
+static VALUE
+cr_quartz_image_surface_initialize (VALUE self, VALUE image_surface)
+{
+  cairo_surface_t *surface;
+
+  surface = cairo_quartz_image_surface_create (RVAL2CRSURFACE (image_surface));
+  rb_cairo_surface_check_status (surface);
+  DATA_PTR (self) = surface;
+  if (rb_block_given_p ())
+    rb_cairo__surface_yield_and_finish (self);
+  return Qnil;
+}
+
+static VALUE
+cr_quartz_image_surface_get_image (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  surface = cairo_quartz_image_surface_get_image (_SELF);
+  if (!surface)
+    return Qnil;
+  rb_cairo_surface_check_status (surface);
+  return CRSURFACE2RVAL (surface);
+}
+#endif
+
+void
+Init_cairo_quartz_surface (void)
+{
+  /* Quartz surface */
+#ifdef RB_CAIRO_HAS_QUARTZ_SURFACE
+  rb_define_method (rb_cCairo_QuartzSurface, "initialize",
+                    cr_quartz_surface_initialize, -1);
+  rb_define_method (rb_cCairo_QuartzSurface, "cg_context",
+                    cr_quartz_surface_get_cg_context, 0);
+#endif
+
+  /* Quartz image surface */
+#ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
+  rb_define_method (rb_cCairo_QuartzImageSurface, "initialize",
+                    cr_quartz_image_surface_initialize, 1);
+  rb_define_method (rb_cCairo_QuartzImageSurface, "image",
+                    cr_quartz_image_surface_get_image, 0);
+#endif
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -116,6 +116,7 @@ files:
 - ext/cairo/rb_cairo_pattern.c
 - ext/cairo/rb_cairo_private.c
 - ext/cairo/rb_cairo_private.h
+- ext/cairo/rb_cairo_quartz_surface.c
 - ext/cairo/rb_cairo_rectangle.c
 - ext/cairo/rb_cairo_region.c
 - ext/cairo/rb_cairo_scaled_font.c
@@ -200,29 +201,29 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for cairo
 test_files:
-- test/test_text_extents.rb
-- test/test_font_face.rb
-- test/test_region.rb
-- test/test_exception.rb
-- test/test_font_extents.rb
-- test/test_scaled_font.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_recording_surface.rb
-- test/test_color.rb
+- test/test_context.rb
 - test/test_surface.rb
+- test/test_constants.rb
 - test/test_text_cluster.rb
 - test/cairo-test-utils.rb
+- test/test_script_surface.rb
+- test/test_color.rb
+- test/test_text_extents.rb
 - test/test_quartz_image_surface.rb
-- test/test_font_options.rb
-- test/test_context.rb
+- test/test_paper.rb
+- test/test_raster_source_pattern.rb
+- test/test_region.rb
 - test/test_script_device.rb
+- test/test_font_face.rb
+- test/test_recording_surface.rb
+- test/test_scaled_font.rb
 - test/test_xml_surface.rb
-- test/test_raster_source_pattern.rb
+- test/run-test.rb
 - test/test_image_surface.rb
+- test/test_font_options.rb
+- test/test_tee_surface.rb
+- test/test_font_extents.rb
+- test/test_xml_device.rb
+- test/test_exception.rb
+- test/test_text_to_glyphs_data.rb
 has_rdoc: