cairo 1.15.13-x64-mingw32 → 1.15.14-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca1e3ca6348081d7a1feee9ca059a2380d490782618047b7c871256082e1f83
-  data.tar.gz: aa234e0d445e72d59eb6622b70f20a8e14d1aac4efa64f53b7ba9c4e945a8cbc
+  metadata.gz: 232fcc3fde1ee933c7456acd422b0a6d6b9de07c640cdefbed5647602e178d2a
+  data.tar.gz: df1c0b24473693309c40ad86a145be61ac65274d83c152bbea3d32b491c82989
 SHA512:
-  metadata.gz: 90d7d0635344527b789c539051291c0727b5cd4b451623e4508bba7fa327e8cee6dbe30da57c0f0b23e0ef3da55ee944d59efc06059d608a47dc52e400f9d032
-  data.tar.gz: c3a7c15d6172f9a799fecd2f7b9f474d7c93e0af0b975b70e36686f41a374577bf09264570914bc4cb571500cce3bc6dcf9019e144762f8777c0f937029a24f1
+  metadata.gz: 0c6ee18a5c3c36b3858d7468207abad3743450b866dadfb3b9fd78f7358257766fc62b179c16505e309011558cc0d5276ecc87c8176dbd58a3c102559dcad1ba
+  data.tar.gz: ad430e2bb2cf2d66583a0dd6b04708e26275b4dea2377894b3de4fe899e65fbdfd0a058e3b4e62cbc5cbca4fcd872505e976fbc6f4e737a31304a8c4a384a6b7

data/NEWS

@@ -1,3 +1,27 @@
+Release 1.15.14 (2018-08-20) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added Cairo::Surface.create {}. Cairo::Surface.new {} is deprecated.
+
+  * Added Cairo::Context.create {}. Cairo::Context.new {} is deprecated.
+
+  * Windows: Added support for installing a normal gem (not fat gem)
+    by "gem install --platform ruby". If you use Bundler, use "bundle
+    config --local force_ruby_platform true" and "bundle exec ruby -rdevkit".
+
+  * Changed to use SPDX license ID in gemspec.
+
+Fixes
+-----
+
+  * Fixed a bug that CRFONTOPTIOSN2RVAL() doesn't copy the target
+    options.
+    * Other CR*2RVAL() copy or refer the target objects. So
+      CRFONTOPTIONS2RVAL() must copy for consistency.
+
 Release 1.15.13 (2018-05-01) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/README.rdoc

@@ -8,12 +8,12 @@ rcairo
 
 Ruby bindings for cairo // cairo extension for Ruby
 
-http://cairographics.org/
+https://cairographics.org/
 
 == Dependencies
 
-* ruby >= 1.9.3 (2.2 also supported!)
-* cairo >= 1.2.0 (1.12.0 also supported!)
+* ruby >= 2.2.1
+* cairo >= 1.2.0
 
 == Install
 
@@ -27,56 +27,27 @@ This way is recommended.
 
 For experimental users.
 
-Download rcairo-X.Y.Z.tar.gz from http://cairographics.org/releases/
+Add the following to your Gemfile:
 
-Extracting:
-  % tar xvzf rcairo-X.Y.Z.tar.gz
+  gem "cairo", github: "rcairo/rcairo"
 
-Compiling:
-  % cd rcairo-X.Y.Z
-  % ruby extconf.rb    # to check for dependencies and create Makefiles
-  % make               # to compile
+Then run the following command:
 
-  # 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.
-
-Options to extconf.rb:
-
-  * --without-vendor-override: Use system libraries instead of those found in
-                               vendor/local for compiling
-
-== Windows
-
-cairo-X.Y.Z-x86-mingw32.gem includes cairo related binaries.
-
-* cairo related binaries:
-  http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
-
-  * cairo-X.Y.Z-a_win32.zip
-  * cairo-dev-X.Y.Z-a_win32.zip
-  * libpng-X.Y.Z-a_win32.zip
-  * zlib-X.Y.Z-a_win32.zip
-  * expat_X.Y.Z-a_win32.zip
-  * fontconfig_X.Y.Z-a_win32.zip
-  * freetype_X.Y.Z-a_win32.zip
+  % bundle install
 
 == Documents
 
 * Reference manual:
-  http://rcairo.github.io/doc/
+  https://rcairo.github.io/doc/
 * Repository of the reference manual:
-  http://github.com/rcairo/doc
+  https://github.com/rcairo/doc
 * An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):
-  http://jp.rubyist.net/magazine/?0019-cairo
+  https://magazine.rubyist.net/articles/0019/0019-cairo.html
 
 == Source
 
 There is the rcairo repository at GitHub:
-http://github.com/rcairo/rcairo
+https://github.com/rcairo/rcairo
 
 == Mailing list
 

data/Rakefile

@@ -54,6 +54,8 @@ Rake::ExtensionTask.new("cairo", spec) do |ext|
   ext.cross_compile = true
   ext.cross_compiling do |_spec|
     if /mingw|mswin/ =~ _spec.platform.to_s
+      _spec.metadata.delete("msys2_mingw_dependencies")
+
       binary_files = []
       Find.find(binary_dir) do |name|
         next unless File.file?(name)
@@ -440,8 +442,8 @@ end
 
 windows_task = WindowsTask.new(spec) do |task|
   zlib_version = "1.2.11"
-  libpng_version = "1.6.34"
-  freetype_version = "2.8.1"
+  libpng_version = "1.6.35"
+  freetype_version = "2.9.1"
   task.packages = [
     {
       # We should use the same version as Ruby Installer.

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 13
+#define RB_CAIRO_VERSION_MICRO 14
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2016 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -25,6 +25,7 @@
 
 VALUE rb_cCairo_Context;
 
+static ID cr_id_new;
 static ID cr_id_surface, cr_id_source;
 static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
 static cairo_user_data_key_t cr_object_holder_key;
@@ -141,6 +142,22 @@ cr_get_reference_count (VALUE self)
   return UINT2NUM (reference_count);
 }
 
+static VALUE
+cr_s_create (int argc, VALUE *argv, VALUE klass)
+{
+  VALUE rb_cr;
+  rb_cr = rb_funcallv (klass, cr_id_new, argc, argv);
+  if (rb_block_given_p ())
+    {
+      return rb_ensure (rb_yield, rb_cr,
+                        cr_destroy_with_destroy_check, rb_cr);
+    }
+  else
+    {
+      return rb_cr;
+    }
+}
+
 static VALUE
 cr_s_wrap (VALUE self, VALUE pointer)
 {
@@ -1230,11 +1247,22 @@ cr_set_font_options (VALUE self, VALUE options)
 static VALUE
 cr_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = cairo_font_options_create ();
+  cairo_font_options_t *options;
+  VALUE rb_options;
+
+  options = cairo_font_options_create ();
   rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_get_font_options (_SELF, options);
+  cr_check_status (_SELF);
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 static VALUE
@@ -1663,6 +1691,8 @@ cr_destroy_all_guarded_contexts_at_end (VALUE data)
 void
 Init_cairo_context (void)
 {
+  cr_id_new = rb_intern ("new");
+
   cr_id_surface = rb_intern ("surface");
   cr_id_source = rb_intern ("source");
 
@@ -1679,6 +1709,8 @@ 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);
 
+  rb_define_singleton_method (rb_cCairo_Context, "create", cr_s_create, -1);
+
   /* For integrate other libraries such as a FFI based library. */
   rb_define_singleton_method (rb_cCairo_Context, "wrap", cr_s_wrap, 1);
 

data/ext/cairo/rb_cairo_font_options.c

@@ -50,8 +50,11 @@ rb_cairo_font_options_to_ruby_object (cairo_font_options_t *options)
 {
   if (options)
     {
+      cairo_font_options_t *copied_options;
+      copied_options = cairo_font_options_copy (options);
+      cr_options_check_status (copied_options);
       return Data_Wrap_Struct (rb_cCairo_FontOptions, NULL,
-                               cr_options_free, options);
+                               cr_options_free, copied_options);
     }
   else
     {
@@ -79,11 +82,7 @@ cr_options_create (VALUE self)
 static VALUE
 cr_options_copy (VALUE self)
 {
-  cairo_font_options_t *options;
-
-  options = cairo_font_options_copy (_SELF (self));
-  cr_options_check_status (options);
-  return CRFONTOPTIONS2RVAL (options);
+  return CRFONTOPTIONS2RVAL (_SELF (self));
 }
 
 static VALUE

data/ext/cairo/rb_cairo_private.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -126,6 +126,6 @@ VALUE rb_cairo__invoke_callback (cr_callback_func_t func, VALUE user_data);
 
 extern VALUE rb_cairo__cFFIPointer;
 
-void rb_cairo__surface_yield_and_finish (VALUE self);
+VALUE rb_cairo__surface_yield_and_finish (VALUE self);
 
 #endif

data/ext/cairo/rb_cairo_scaled_font.c

@@ -181,12 +181,21 @@ static VALUE
 cr_scaled_font_get_font_options (VALUE self)
 {
   cairo_font_options_t *options;
+  VALUE rb_options;
 
-  options = cairo_font_options_create();
+  options = cairo_font_options_create ();
+  rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_scaled_font_get_font_options (_SELF (self), options);
   cr_scaled_font_check_status (_SELF (self));
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 #if CAIRO_CHECK_VERSION(1, 7, 2)

data/ext/cairo/rb_cairo_surface.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -90,6 +90,7 @@ VALUE rb_cCairo_SkiaSurface = Qnil;
 VALUE rb_cCairo_SubSurface = Qnil;
 VALUE rb_cCairo_CoglSurface = Qnil;
 
+static ID cr_id_new;
 static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
@@ -217,6 +218,67 @@ cr_surface_get_klass (cairo_surface_t *surface)
   return klass;
 }
 
+static void
+rb_cairo_surface_adjust_memory_usage (cairo_surface_t *surface,
+                                      cairo_bool_t new)
+{
+#ifdef HAVE_RB_GC_ADJUST_MEMORY_USAGE
+  if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
+    {
+      ssize_t memory_usage_diff;
+      memory_usage_diff =
+        cairo_image_surface_get_stride (surface) *
+        cairo_image_surface_get_height (surface);
+      if (!new)
+        memory_usage_diff = -memory_usage_diff;
+      rb_gc_adjust_memory_usage (memory_usage_diff);
+    }
+#endif
+}
+
+static void
+cr_surface_destroy_raw (cairo_surface_t *surface)
+{
+  rb_cairo_surface_adjust_memory_usage (surface, CR_FALSE);
+  cairo_surface_destroy (surface);
+}
+
+static VALUE
+cr_surface_destroy (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  surface = _SELF;
+  cr_surface_destroy_raw (surface);
+  DATA_PTR (self) = NULL;
+
+  return self;
+}
+
+static VALUE
+cr_surface_destroy_with_destroy_check (VALUE self)
+{
+  if (_SELF)
+    cr_surface_destroy (self);
+  return Qnil;
+}
+
+static VALUE
+cr_surface_create (int argc, VALUE *argv, VALUE klass)
+{
+  VALUE rb_surface;
+  rb_surface = rb_funcallv (klass, cr_id_new, argc, argv);
+  if (rb_block_given_p ())
+    {
+      return rb_ensure (rb_cairo__surface_yield_and_finish, rb_surface,
+                        cr_surface_destroy_with_destroy_check, rb_surface);
+    }
+  else
+    {
+      return rb_surface;
+    }
+}
+
 static VALUE
 cr_surface_image_supported_p (VALUE klass)
 {
@@ -349,24 +411,6 @@ cr_surface_xml_supported_p (VALUE klass)
 #endif
 }
 
-static void
-rb_cairo_surface_adjust_memory_usage (cairo_surface_t *surface,
-                                      cairo_bool_t new)
-{
-#ifdef HAVE_RB_GC_ADJUST_MEMORY_USAGE
-  if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
-    {
-      ssize_t memory_usage_diff;
-      memory_usage_diff =
-        cairo_image_surface_get_stride (surface) *
-        cairo_image_surface_get_height (surface);
-      if (!new)
-        memory_usage_diff = -memory_usage_diff;
-      rb_gc_adjust_memory_usage (memory_usage_diff);
-    }
-#endif
-}
-
 /* constructor/de-constructor */
 cairo_surface_t *
 rb_cairo_surface_from_ruby_object (VALUE obj)
@@ -402,9 +446,7 @@ cr_surface_free (void *ptr)
   if (!surface)
     return;
 
-  rb_cairo_surface_adjust_memory_usage (surface, CR_FALSE);
-
-  cairo_surface_destroy (surface);
+  cr_surface_destroy_raw (surface);
 }
 
 VALUE
@@ -453,18 +495,6 @@ cr_surface_initialize (int argc, VALUE *argv, VALUE self)
 }
 
 /* Surface manipulation */
-static VALUE
-cr_surface_destroy (VALUE self)
-{
-  cairo_surface_t *surface;
-
-  surface = _SELF;
-  cairo_surface_destroy (surface);
-  DATA_PTR (self) = NULL;
-
-  return self;
-}
-
 static VALUE
 cr_surface_get_reference_count (VALUE self)
 {
@@ -497,20 +527,25 @@ cr_surface_finish (VALUE self)
   return self;
 }
 
-void
+VALUE
 rb_cairo__surface_yield_and_finish (VALUE self)
 {
+  VALUE rb_result;
   cairo_surface_t *surface;
 
-  rb_yield (self);
+  rb_result = rb_yield (self);
 
   surface = _SELF;
+  if (!surface)
+    return rb_result;
   if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
-    return;
+    return rb_result;
   if (cairo_surface_get_user_data (surface, &cr_finished_key))
-    return;
+    return rb_result;
 
   cr_surface_finish (self);
+
+  return rb_result;
 }
 
 static VALUE
@@ -632,14 +667,6 @@ cr_surface_unmap_image (VALUE self, VALUE rb_mapped_image)
 #endif
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
-static VALUE
-cr_surface_destroy_with_destroy_check (VALUE self)
-{
-  if (DATA_PTR (self))
-    cr_surface_destroy (self);
-  return Qnil;
-}
-
 static VALUE
 cr_surface_create_sub_rectangle_surface (VALUE self, VALUE x, VALUE y,
                                          VALUE width, VALUE height)
@@ -782,11 +809,22 @@ cr_surface_supported_mime_type_p (VALUE self, VALUE rb_mime_type)
 static VALUE
 cr_surface_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = cairo_font_options_create();
+  cairo_font_options_t *options;
+  VALUE rb_options;
+
+  options = cairo_font_options_create ();
+  rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_surface_get_font_options (_SELF, options);
   rb_cairo_surface_check_status (_SELF);
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 static VALUE
@@ -1967,6 +2005,7 @@ cr_finish_all_guarded_surfaces_at_end (VALUE data)
 void
 Init_cairo_surface (void)
 {
+  cr_id_new = rb_intern ("new");
   cr_id_parse = rb_intern ("parse");
   cr_id_size = rb_intern ("size");
   cr_id_set_unit = rb_intern ("unit=");
@@ -1982,6 +2021,8 @@ Init_cairo_surface (void)
   rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Surface);
   rb_set_end_proc(cr_finish_all_guarded_surfaces_at_end, Qnil);
 
+  rb_define_singleton_method (rb_cCairo_Surface, "create",
+                              cr_surface_create, -1);
   rb_define_singleton_method (rb_cCairo_Surface, "image_supported?",
                               cr_surface_image_supported_p, 0);
   rb_define_singleton_method (rb_cCairo_Surface, "pdf_supported?",