cairo 1.15.2-x64-mingw32 → 1.15.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d201051ff0548cfd8317553017820243440b2e
-  data.tar.gz: 8a21873bc7470dcae53c0a6ea9886a445f493f1d
+  metadata.gz: d7b6f7a1c85d665ebbdd7d42fb7d8467943125c6
+  data.tar.gz: 644b2793717a24e9941263e8abc4a5d2e08b8bcb
 SHA512:
-  metadata.gz: d9a62ef061cef899aef7f8b1295abb3d72707e90177f42b50a0267f9cd6a3d0e7a49ac4c4991bd55f052357bda4794a5d7071a17a776ac10d89c923e463432c1
-  data.tar.gz: 134297c65302eef7e82ada95efbf8dd41fd2dc60c809161003762a6aa369b441a2b952b2976204a374e4b71c8c8601666e1702fd346f55cfb618eaa7eb689197
+  metadata.gz: 8540678df4eb9e5e2e1606fa95988b32c136f8e6871998a020a0cbe28aa9773158326a5af37092d8fbc3f4a2c2a23fdcdeb1669028cc06791f001e77ee4d0ea8
+  data.tar.gz: 397a7c85f59bb6d18e9379e7254c8ba9706b8f44eb1e996b95d8f1c23235c4ccf2458e62ba4b0b3510887e7ed15c4c30d73dd41e3fd8737e5bff5a21d3e7c43c

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

data/vendor/local/bin/freetype-config

@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 18.3.12
+    echo 18.6.12
     exit 0
     ;;
   --ftversion)

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.21"
+version="1.6.26"
 prefix="/home/vagrant/rcairo.win64/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.21"
+version="1.6.26"
 prefix="/home/vagrant/rcairo.win64/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/xml2-config

@@ -58,7 +58,7 @@ while test $# -gt 0; do
       ;;
 
     --version)
-	echo 2.9.2
+	echo 2.9.4
 	exit 0
 	;;
 
@@ -86,12 +86,12 @@ while test $# -gt 0; do
 	then
 	    if [ "-L${libdir}" = "-L/usr/lib" -o "-L${libdir}" = "-L/usr/lib64" ]
 	    then
-		echo -lxml2 -lz     
+		echo -lxml2 -L/home/vagrant/rcairo.win64/vendor/local/lib -lz       
 	    else
-		echo -L${libdir} -lxml2 -lz     
+		echo -L${libdir} -lxml2 -L/home/vagrant/rcairo.win64/vendor/local/lib -lz       
 	    fi
 	else
-	    echo -L${libdir} -lxml2 -lz      -lws2_32
+	    echo -L${libdir} -lxml2 -L/home/vagrant/rcairo.win64/vendor/local/lib -lz        -lws2_32
 	fi
        	;;
 

data/vendor/local/etc/fonts/conf.d/10-hinting-slight.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
+  </match>
+</fontconfig>

data/vendor/local/etc/fonts/conf.d/10-scale-bitmap-fonts.conf

@@ -2,8 +2,13 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
+<!--
+  If font is bitmap, calculate scale factor.
+  Note that color bitmap fonts have scalable=true, while
+  non-color ones have scalable=false.  Both groups have outline=false.
+  -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <edit name="pixelsizefixupfactor" mode="assign">
@@ -13,10 +18,20 @@
     </divide>
   </edit>
 </match>
+<!--
+  For non-scalable bitmap fonts (ie. non-color), skip
+  minor scaling if hinting is enabled.
+  -->
 <match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
   <test name="scalable" compare="eq">
     <bool>false</bool>
   </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
   <edit name="scalingnotneeded" mode="assign">
     <and>
       <less>
@@ -30,20 +45,7 @@
     </and>
   </edit>
 </match>
-<!--
-  So far we determined the scale factor.  Now, check and if
-  scaling is NOT desirable, just reset the scale factor to 1.0.
-  -->
 <match target="font">
-  <test name="scalable" compare="eq">
-    <bool>false</bool>
-  </test>
-  <test name="pixelsize" target="pattern" compare="less">
-    <double>64</double>
-  </test>
-  <test name="hinting" compare="eq">
-    <bool>true</bool>
-  </test>
   <test name="scalingnotneeded" compare="eq">
     <bool>true</bool>
   </test>
@@ -55,7 +57,7 @@
   If we *are* going to scale, go ahead and do it.
   -->
 <match target="font">
-  <test name="scalable" compare="eq">
+  <test name="outline" compare="eq">
     <bool>false</bool>
   </test>
   <test name="pixelsizefixupfactor" compare="not_eq">