cairo 1.15.2 → 1.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8d108c3b58a948209183a2fb63c498731dbb51
-  data.tar.gz: 0db2b2faff68e8af41bd09d08161b4ad8ba7faa5
+  metadata.gz: 423b5d3e45915806cef384e43a6ab18f29d3446f
+  data.tar.gz: b15dd8ad7d922e3f9fdf1e460fb961a3f5528fa4
 SHA512:
-  metadata.gz: fd3b30e2edec6c2e4991cde704b111a85709740d6b69942af539f583b2835a200670fc1cd7715e8bb9c9e32b4f3460b154c9facb03009d9ab39110857eda0602
-  data.tar.gz: 45d4bae75b757f75b3b676fb6c44e3be98a57f70af016f5dcb78ef1481f87256f56d50402c46a85de750556b466a7d14e4f946120905af66f99f827405243cac
+  metadata.gz: 50099d9a793c264b629c0202db692bb60f03feacd169e04692223d115c17a763cb4a9649111e84f04dc229cdeb8ac63a3f9a69233b06b361d94d7b94a7c77ece
+  data.tar.gz: 6bf5a8b2ece952830ccd1180a34b8177b8a690806a672b77df701d068be041ac6bec26bf4c9ca8d8cc048a6d1e9e170a1bda3b35ed669861a4d05b3a1f302d82

data/NEWS

@@ -1,3 +1,23 @@
+Release 1.15.3 (2016-11-15) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Changed Cairo::FontOptions#== behavior to value equality check
+    from object equality check.
+  * Windows: Supported Ruby 2.4.
+  * Windows: Updated bundled libpng.
+  * Windows: Updated bundled freetype.
+  * Windows: Updated bundled libxml.
+  * Windows: Updated bundled fontconfig.
+  * Windows: Updated bundled pixman.
+  * Made Cairo::ImageSurface GC friendly with Ruby 2.4.
+  * Cairo::SVGSurface: Accepted nil as filename.
+    [GitHub#43][Reported by Andy Meneely]
+  * Cairo::PSSurface: Accepted nil as filename.
+  * Cairo::PDFSurface: Accepted nil as filename.
+
 Release 1.15.2 (2016-04-02) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -116,9 +116,9 @@ class Package < Struct.new(:name,
   def download_site_base_url
     case download_site
     when :cairo
-      base_url = "http://cairographics.org/releases"
+      base_url = "https://cairographics.org/releases"
     when :cairo_snapshots
-      base_url = "http://cairographics.org/snapshots"
+      base_url = "https://cairographics.org/snapshots"
     when :gnome
       base_url = "http://ftp.gnome.org/pub/gnome/sources"
       release_series = version.gsub(/\A(\d+\.\d+).+\z/, '\1')
@@ -452,24 +452,24 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.21",
-      :download_base_url => "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.21",
+      :version => "1.6.26",
+      :download_base_url => "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.26",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.6.3",
-      :download_base_url => "http://downloads.sourceforge.net/project/freetype/freetype2/2.6.3",
+      :version => "2.7",
+      :download_base_url => "http://downloads.sourceforge.net/project/freetype/freetype2/2.7",
       :compression_method => "bz2",
       :windows => {
-        :built_file => "bin/libfreetype-6.dll",
+        :built_file => "bin/libfreetype-7.dll",
       },
     },
     {
       :name => "libxml2",
-      :version => "2.9.2",
+      :version => "2.9.4",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -477,15 +477,11 @@ windows_task = WindowsTask.new(spec) do |task|
         :configure_args => [
           "--without-python",
         ],
-        :patches => [
-          "remove-empty-z_dir-ldflags.diff",
-        ],
-        :need_autoreconf => true,
       },
     },
     {
       :name => "fontconfig",
-      :version => "2.11.1",
+      :version => "2.12.1",
       :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -494,15 +490,11 @@ windows_task = WindowsTask.new(spec) do |task|
           "--enable-libxml2",
           "--disable-docs",
         ],
-        :patches => [
-          "fontconfig-2.11.1-disable-mktemp-s.diff",
-        ],
-        :need_autoreconf => true,
       },
     },
     {
       :name => "pixman",
-      :version => "0.32.6",
+      :version => "0.34.0",
       :download_site => :cairo,
       :compression_method => "gz",
       :windows => {

data/ext/cairo/extconf.rb

@@ -208,6 +208,7 @@ $defs << "-DRB_CAIRO_COMPILATION"
 have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
 have_header("ruby/io.h") unless have_macro("HAVE_RUBY_IO_H", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
+have_func("rb_gc_adjust_memory_usage", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 
 create_makefile(module_name)

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 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_font_options.c

@@ -96,6 +96,9 @@ cr_options_merge (VALUE self, VALUE other)
 static VALUE
 cr_options_equal (VALUE self, VALUE other)
 {
+  if (!rb_cairo__is_kind_of (other, rb_cCairo_FontOptions))
+    return Qfalse;
+
   return CBOOL2RVAL (cairo_font_options_equal (_SELF (self), _SELF (other)));
 }
 
@@ -168,12 +171,13 @@ Init_cairo_font_options (void)
     rb_define_class_under (rb_mCairo, "FontOptions", rb_cObject);
 
   rb_define_alloc_func (rb_cCairo_FontOptions, cr_options_allocate);
-  
+
   rb_define_method (rb_cCairo_FontOptions, "initialize", cr_options_create, 0);
 
   rb_define_method (rb_cCairo_FontOptions, "dup", cr_options_copy, 0);
   rb_define_method (rb_cCairo_FontOptions, "merge!", cr_options_merge, 1);
   rb_define_alias (rb_cCairo_FontOptions, "update", "merge!");
+  rb_define_method (rb_cCairo_FontOptions, "==", cr_options_equal, 1);
   rb_define_method (rb_cCairo_FontOptions, "eql?", cr_options_equal, 1);
   rb_define_method (rb_cCairo_FontOptions, "hash", cr_options_hash, 0);
   rb_define_method (rb_cCairo_FontOptions, "set_antialias",

data/ext/cairo/rb_cairo_surface.c

@@ -349,6 +349,24 @@ 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)
@@ -381,8 +399,12 @@ cr_surface_free (void *ptr)
 {
   cairo_surface_t *surface = ptr;
 
-  if (surface)
-    cairo_surface_destroy (surface);
+  if (!surface)
+    return;
+
+  rb_cairo_surface_adjust_memory_usage (surface, CR_FALSE);
+
+  cairo_surface_destroy (surface);
 }
 
 VALUE
@@ -393,6 +415,7 @@ rb_cairo_surface_to_ruby_object (cairo_surface_t *surface)
       VALUE klass;
       klass = cr_surface_get_klass (surface);
       cairo_surface_reference (surface);
+      rb_cairo_surface_adjust_memory_usage (surface, CR_TRUE);
       return Data_Wrap_Struct (klass, NULL, cr_surface_free, surface);
     }
   else
@@ -984,6 +1007,7 @@ cr_image_surface_initialize (int argc, VALUE *argv, VALUE self)
 
   rb_cairo_surface_check_status (surface);
   DATA_PTR (self) = surface;
+  rb_cairo_surface_adjust_memory_usage (surface, CR_TRUE);
   if (rb_block_given_p ())
     rb_cairo__surface_yield_and_finish (self);
   return Qnil;
@@ -1094,10 +1118,12 @@ cr_ ## type ## _surface_initialize (int argc, VALUE *argv, VALUE self)  \
     }                                                                   \
   else                                                                  \
     {                                                                   \
-      surface =                                                         \
-        cairo_ ## type ## _surface_create (StringValueCStr (target),    \
-                                           width_in_points,             \
-                                           height_in_points);           \
+      const char *filename = NULL;                                      \
+      if (!NIL_P (target))                                              \
+        filename = StringValueCStr (target);                            \
+      surface = cairo_ ## type ## _surface_create (filename,            \
+                                                   width_in_points,     \
+                                                   height_in_points);   \
     }                                                                   \
                                                                         \
   rb_cairo_surface_check_status (surface);                              \

data/test/test_font_options.rb

@@ -7,7 +7,52 @@ class FontOptionsTest < Test::Unit::TestCase
     @options = Cairo::FontOptions.new
   end
 
-  def test_something
-    # WRITE ME!
+  sub_test_case "#==" do
+    test "not FontOptions" do
+      assert do
+        !(@options == nil)
+      end
+    end
+
+    test "same object" do
+      assert do
+        @options == @options
+      end
+    end
+
+    test "same content" do
+      assert do
+        @options == @options.dup
+      end
+    end
+  end
+
+  sub_test_case "#eql? and #hash" do
+    test "not FontOptions" do
+      object = Object.new
+      options = @options
+      object.singleton_class.__send__(:define_method, :hash) do
+        options.hash
+      end
+
+      hash = {
+        object => :value,
+      }
+      assert_nil(hash[@options])
+    end
+
+    test "same object" do
+      hash = {
+        @options => :value,
+      }
+      assert_equal(:value, hash[@options])
+    end
+
+    test "same content" do
+      hash = {
+        @options => :value,
+      }
+      assert_equal(:value, hash[@options.dup])
+    end
   end
 end

data/test/test_pdf_surface.rb

@@ -0,0 +1,8 @@
+class PDFSurfaceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def test_new_with_nil_target
+    surface = Cairo::PDFSurface.new(nil, 10, 20)
+    surface.finish
+  end
+end

data/test/test_svg_surface.rb

@@ -0,0 +1,8 @@
+class SVGSurfaceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def test_new_with_nil_target
+    surface = Cairo::SVGSurface.new(nil, 10, 20)
+    surface.finish
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -162,6 +162,7 @@ files:
 - test/test_font_options.rb
 - test/test_image_surface.rb
 - test/test_paper.rb
+- test/test_pdf_surface.rb
 - test/test_quartz_image_surface.rb
 - test/test_raster_source_pattern.rb
 - test/test_recording_surface.rb
@@ -170,6 +171,7 @@ files:
 - test/test_script_device.rb
 - test/test_script_surface.rb
 - test/test_surface.rb
+- test/test_svg_surface.rb
 - test/test_tee_surface.rb
 - test/test_text_cluster.rb
 - test/test_text_extents.rb
@@ -206,6 +208,7 @@ test_files:
 - test/test_font_extents.rb
 - test/test_scaled_font.rb
 - test/test_paper.rb
+- test/test_svg_surface.rb
 - test/test_script_device.rb
 - test/test_xml_device.rb
 - test/cairo-test-utils.rb
@@ -222,8 +225,8 @@ test_files:
 - test/test_color.rb
 - test/test_constants.rb
 - test/test_text_to_glyphs_data.rb
+- test/test_pdf_surface.rb
 - test/test_surface.rb
 - test/test_exception.rb
 - test/test_xml_surface.rb
 - test/test_region.rb
-has_rdoc: