cairo 1.12.9-x86-mingw32 → 1.14.0-x86-mingw32

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)
 

data/vendor/local/bin/freetype-config

@@ -12,11 +12,11 @@
 LC_ALL=C
 export LC_ALL
 
-prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
-exec_prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
+prefix="/home/vagrant/rcairo.win32/vendor/local"
+exec_prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix_set="no"
-includedir="/home/kou/work/ruby/rcairo.win32/vendor/local/include"
-libdir="/home/kou/work/ruby/rcairo.win32/vendor/local/lib"
+includedir="/home/vagrant/rcairo.win32/vendor/local/include"
+libdir="/home/vagrant/rcairo.win32/vendor/local/lib"
 enable_shared=""
 
 usage()
@@ -142,8 +142,8 @@ if test "$echo_cflags" = "yes" ; then
 fi
 
 if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -lz -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -lpng16"
-  staticlibs="-lfreetype -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -lz -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -lpng16 -lz"
+  libs="-lfreetype -L/home/vagrant/rcairo.win32/vendor/local/lib -lz -L/home/vagrant/rcairo.win32/vendor/local/lib -lpng16"
+  staticlibs="-lfreetype -L/home/vagrant/rcairo.win32/vendor/local/lib -lz -L/home/vagrant/rcairo.win32/vendor/local/lib -lpng16 -lz"
   if test "$show_static" = "yes" ; then
     libs="$staticlibs"
   fi

data/vendor/local/bin/libpng-config

@@ -11,8 +11,8 @@
 
 # Modeled after libxml-config.
 
-version="1.6.10"
-prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
+version="1.6.14"
+prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"

data/vendor/local/bin/libpng16-config

@@ -11,8 +11,8 @@
 
 # Modeled after libxml-config.
 
-version="1.6.10"
-prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
+version="1.6.14"
+prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"