cairo 1.15.7-x64-mingw32 → 1.15.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c114e585154bd814104808a1945f2773a09557a
-  data.tar.gz: a0934443b7f996f2be5ee624b9c0705f0ee296bf
+  metadata.gz: 82ee4dc122d3000fbb31cbeb42fd39a4b8f29872
+  data.tar.gz: 53f84f9c20a8a5786cffdde5493dce38f627118e
 SHA512:
-  metadata.gz: e205175fa3fcabc57bfe81105af3dc2caca106bd6d5815712f599a9eb285366a81a15210e784cf5f6d0f2412d322035ddee558e131e21b2d340cb7c142cf593b
-  data.tar.gz: d0dd20ccaf896a257780f785ae5072ce81552ec3a9ac6eeff27d48738ea28b8c559f1cb857fc01af4985746b74f29691302b774d21a00d3a5ee6c751554bd03a
+  metadata.gz: 2edd5b53c134a9f9b7f12e1703055df6ae15d2aae91066d58bb66b291c5953bc8ee38901413902ac156034b2661b46c68e474e52b9438751b66ebf8bd1d1ca61
+  data.tar.gz: cf26fdb1fcfd7f4cb20766b51e2c4bbbf9486f9bcc1f9765a59b89655e5aa381dce46f659671247e41a3ba8ab4af8fc058690da63be64891247538b78f7dc0cd

data/NEWS

@@ -1,3 +1,27 @@
+Release 1.15.8 (2017-05-29) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Added Cairo::FreeTypeFotnFace.
+    [GitHub#45][Patch by Stafford Brunk]
+
+  * Windows: Supported Ruby 2.4.
+    [ruby-list:50525][Reported by 5.5]
+
+  * Windows: Supported MSYS2.
+
+  * Windows: Updated bundled libraries:
+    * zlib: 1.2.8 -> 1.2.11
+
+Thanks
+------
+
+  * Stafford Brunk
+
+  * 5.5
+
 Release 1.15.7 (2017-05-01) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -420,8 +420,11 @@ class ZlibBuilder
   include Rake::DSL
 
   def build(package, install_dir)
+    version_for_path = package.version.gsub(".", "")
+    dll_name = "zlib#{version_for_path}.dll"
     sh("make",
        "PREFIX=#{package.windows.build_host}-",
+       "SHAREDLIB=#{dll_name}",
        "-f",
        "win32/Makefile.gcc")
     include_path = install_dir + "include"
@@ -432,6 +435,7 @@ class ZlibBuilder
        "LIBRARY_PATH=#{library_path}",
        "BINARY_PATH=#{binary_path}",
        "SHARED_MODE=1",
+       "SHAREDLIB=#{dll_name}",
        "-f",
        "win32/Makefile.gcc",
        "install")
@@ -439,16 +443,17 @@ class ZlibBuilder
 end
 
 windows_task = WindowsTask.new(spec) do |task|
+  zlib_version = "1.2.11"
   task.packages = [
     {
       # We should use the same version as Ruby Installer.
       :name => "zlib",
-      :version => "1.2.8",
-      :download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/1.2.8",
+      :version => zlib_version,
+      :download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/#{zlib_version}",
       :compression_method => "gz",
       :windows => {
         :builder => ZlibBuilder.new,
-        :built_file => "bin/zlib1.dll",
+        :built_file => "bin/zlib#{zlib_version.gsub(".", "")}.dll",
       },
     },
     {

data/ext/cairo/cairo.def

@@ -22,6 +22,7 @@ EXPORTS
     rb_cCairo_RasterSourcePattern DATA
 
     rb_cCairo_FontFace        DATA
+    rb_cCairo_FreeTypeFontFace DATA
     rb_cCairo_ToyFontFace     DATA
     rb_cCairo_UserFontFace    DATA
     rb_cCairo_UserFontFace_TextToGlyphsData DATA

data/ext/cairo/extconf.rb

@@ -61,10 +61,13 @@ unless required_pkg_config_package([package, major, minor, micro],
                                    :debian => "libcairo2-dev",
                                    :redhat => "cairo-devel",
                                    :homebrew => "cairo",
-                                   :macports => "cairo")
+                                   :macports => "cairo",
+                                   :msys2 => "cairo")
   exit(false)
 end
 
+PKGConfig.have_package("cairo-ft")
+
 checking_for(checking_message("Mac OS X")) do
   case RUBY_PLATFORM
   when /darwin/

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 7
+#define RB_CAIRO_VERSION_MICRO 8
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -96,6 +96,7 @@ RB_CAIRO_VAR VALUE rb_cCairo_RadialPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_MeshPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_RasterSourcePattern;
 RB_CAIRO_VAR VALUE rb_cCairo_FontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_FreeTypeFontFace;
 RB_CAIRO_VAR VALUE rb_cCairo_ToyFontFace;
 RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace;
 RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace_TextToGlyphsData;

data/ext/cairo/rb_cairo_font_face.c

@@ -17,10 +17,20 @@
 #include "rb_cairo_private.h"
 
 VALUE rb_cCairo_FontFace;
+VALUE rb_cCairo_FreeTypeFontFace = Qnil;
 VALUE rb_cCairo_ToyFontFace = Qnil;
 VALUE rb_cCairo_UserFontFace = Qnil;
 VALUE rb_cCairo_UserFontFace_TextToGlyphsData = Qnil;
 
+#ifdef CAIRO_HAS_FT_FONT
+#  include <cairo-ft.h>
+
+static cairo_user_data_key_t cr_freetype_face_key;
+static FT_Library cr_freetype_library;
+static int cr_freetype_n_faces = 0;
+static cairo_bool_t cr_freetype_finishing = CR_FALSE;
+#endif
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 static cairo_user_data_key_t ruby_object_key;
 static ID cr_id_call;
@@ -84,6 +94,11 @@ rb_cairo_font_face_to_ruby_object (cairo_font_face_t *face)
 
       switch (cairo_font_face_get_type (face))
         {
+#ifdef CAIRO_HAS_FT_FONT
+        case CAIRO_FONT_TYPE_FT:
+          klass = rb_cCairo_FreeTypeFontFace;
+          break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 7, 6)
         case CAIRO_FONT_TYPE_TOY:
           klass = rb_cCairo_ToyFontFace;
@@ -121,6 +136,143 @@ cr_font_face_quartz_supported_p (VALUE klass)
 #endif
 }
 
+static VALUE
+cr_font_face_freetype_supported_p (VALUE klass)
+{
+#ifdef CAIRO_HAS_FT_FONT
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
+#ifdef CAIRO_HAS_FT_FONT
+static VALUE
+cr_freetype_done_library (VALUE data)
+{
+  cr_freetype_finishing = CR_TRUE;
+  if (cr_freetype_n_faces == 0)
+    FT_Done_FreeType (cr_freetype_library);
+  return Qnil;
+}
+
+static void
+cr_freetype_done_face (void *data)
+{
+  FT_Face face = data;
+
+  FT_Done_Face (face);
+  cr_freetype_n_faces--;
+  if (cr_freetype_n_faces == 0 && cr_freetype_finishing)
+    FT_Done_FreeType (cr_freetype_library);
+}
+
+static cairo_bool_t
+cr_freetype_error_detail (FT_Error error,
+                          const char **name,
+                          const char **message)
+{
+#undef __FTERRORS_H__
+#define FT_STRINGIFY(v) #v
+#define FT_ERRORDEF(e, v, s)    {FT_STRINGIFY(e), v, s},
+#define FT_ERROR_START_LIST     {
+#define FT_ERROR_END_LIST       {NULL, 0, NULL}};
+  size_t i = 0;
+  static const struct {
+    const char *name;
+    FT_Error code;
+    const char *message;
+  } errors[] =
+#include FT_ERRORS_H
+  for (i = 0; i < (sizeof (errors) / sizeof (errors[0])); i++)
+    {
+      if (errors[i].code == error)
+        {
+          *name = errors[i].name;
+          *message = errors[i].message;
+          return CR_TRUE;
+        }
+    }
+
+  return CR_FALSE;
+}
+
+static void
+cr_freetype_error_check (FT_Error error,
+                         const char *message,
+                         VALUE related_object)
+{
+  const char *name = NULL;
+  const char *system_message = NULL;
+  const char *error_class_name;
+  VALUE rb_eCairo_FreeTypeError;
+
+  if (error == FT_Err_Ok)
+    return;
+
+  cr_freetype_error_detail (error, &name, &system_message);
+#if CAIRO_CHECK_VERSION(1, 15, 4)
+  error_class_name = "FreeTypeError";
+#else
+  error_class_name = "Error";
+#endif
+  rb_eCairo_FreeTypeError =
+    rb_const_get (rb_mCairo, rb_intern (error_class_name));
+  if (NIL_P (related_object))
+    {
+      rb_raise (rb_eCairo_FreeTypeError,
+                "%s: %s[%d]: %s",
+                message,
+                name ? name : "unknown",
+                error,
+                system_message ? system_message : "unknown");
+    }
+  else
+    {
+      rb_raise (rb_eCairo_FreeTypeError,
+                "%s: %s[%d]: %s: %+" PRIsVALUE,
+                message,
+                name ? name : "unknown",
+                error,
+                system_message ? system_message : "unknown",
+                related_object);
+    }
+}
+
+static VALUE
+cr_freetype_font_face_initialize (VALUE self, VALUE path)
+{
+  FT_Face freetype_face;
+  FT_Error error;
+  cairo_font_face_t *face;
+  cairo_status_t status;
+
+  error = FT_New_Face (cr_freetype_library,
+                       StringValueCStr(path),
+                       0,
+                       &freetype_face);
+  cr_freetype_error_check (error, "failed to open FreeType font", path);
+  cr_freetype_n_faces++;
+
+  face = cairo_ft_font_face_create_for_ft_face (freetype_face, 0);
+  cr_font_face_check_status (face);
+  status =
+    cairo_font_face_set_user_data (face,
+                                   &cr_freetype_face_key,
+                                   freetype_face,
+                                   (cairo_destroy_func_t) cr_freetype_done_face);
+  if (status != CAIRO_STATUS_SUCCESS) {
+    cairo_font_face_destroy (face);
+    FT_Done_Face (freetype_face);
+    rb_cairo_check_status (status);
+  }
+
+  DATA_PTR (self) = face;
+
+  return Qnil;
+}
+#endif
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 static VALUE
 cr_toy_font_face_initialize (int argc, VALUE *argv, VALUE self)
@@ -664,6 +816,26 @@ Init_cairo_font (void)
 
   rb_define_singleton_method (rb_cCairo_FontFace, "quartz_supported?",
                               cr_font_face_quartz_supported_p, 0);
+  rb_define_singleton_method (rb_cCairo_FontFace, "freetype_supported?",
+                              cr_font_face_freetype_supported_p, 0);
+
+#ifdef CAIRO_HAS_FT_FONT
+  rb_cCairo_FreeTypeFontFace =
+    rb_define_class_under (rb_mCairo, "FreeTypeFontFace", rb_cCairo_FontFace);
+
+  {
+    FT_Error error;
+
+    error = FT_Init_FreeType (&cr_freetype_library);
+    cr_freetype_error_check (error, "failed to initialize FreeType", Qnil);
+
+    rb_define_finalizer (rb_cCairo_FreeTypeFontFace,
+                         rb_proc_new (cr_freetype_done_library, Qnil));
+  }
+
+  rb_define_method (rb_cCairo_FreeTypeFontFace, "initialize",
+                    cr_freetype_font_face_initialize, 1);
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 7, 6)
   rb_cCairo_ToyFontFace =

data/test/cairo-test-utils.rb

@@ -42,4 +42,8 @@ module CairoTestUtils
       omit("Only for #{name} device available")
     end
   end
+
+  def fixture_path(*components)
+    File.join(__dir__, "fixture", *components)
+  end
 end

data/test/test_font_face.rb

@@ -3,6 +3,52 @@ require 'cairo'
 class FontFaceTest < Test::Unit::TestCase
   include CairoTestUtils
 
+  sub_test_case("FreeTypeFontFace") do
+    setup do
+      omit("Need FreeType support") unless Cairo::FontFace.freetype_supported?
+    end
+
+    sub_test_case("initialize") do
+      test("valid") do
+        assert_nothing_raised do
+          Cairo::FreeTypeFontFace.new(fixture_path("a.otf"))
+        end
+      end
+
+      sub_test_case("invalid") do
+        setup do
+          if Cairo.const_defined?(:FreeTypeError)
+            @error_class = Cairo::FreeTypeError
+          else
+            @error_class = Cairo::Error
+          end
+        end
+
+        test("broken") do
+          path = __FILE__
+          message = "failed to open FreeType font: "
+          message << "FT_Err_Unknown_File_Format[2]: "
+          message << "unknown file format: "
+          message << path.inspect
+          assert_raise(@error_class.new(message)) do
+            Cairo::FreeTypeFontFace.new(path)
+          end
+        end
+
+        test("nonexistent") do
+          path = fixture_path("nonexistent.otf")
+          message = "failed to open FreeType font: "
+          message << "FT_Err_Cannot_Open_Resource[1]: "
+          message << "cannot open resource: "
+          message << path.inspect
+          assert_raise(@error_class.new(message)) do
+            Cairo::FreeTypeFontFace.new(path)
+          end
+        end
+      end
+    end
+  end
+
   def test_toy_font_face_new
     only_cairo_version(1, 7, 2)