cairo 1.10.0-x86-mingw32 → 1.10.1-x86-mingw32

data/ext/cairo/rb_cairo_context.c

@@ -1450,12 +1450,13 @@ static VALUE
 cr_get_target (VALUE self)
 {
   cairo_surface_t *surface;
-  VALUE rb_surface;
+  VALUE rb_surface = Qnil;
 
   surface = cairo_get_target (_SELF);
   rb_cairo_check_status (cairo_surface_status (surface));
 
-  rb_surface = rb_ivar_get (self, cr_id_surface);
+  if (RTEST (rb_ivar_defined (self, cr_id_surface)))
+      rb_surface = rb_ivar_get (self, cr_id_surface);
   if (NIL_P (rb_surface) || RVAL2CRSURFACE (rb_surface) != surface)
     {
       rb_surface = CRSURFACE2RVAL (surface);

data/ext/cairo/rb_cairo_device.c

@@ -22,6 +22,10 @@
 #  include <cairo-xml.h>
 #endif
 
+#if defined(CAIRO_HAS_SCRIPT_SURFACE) || defined(CAIRO_HAS_XML_SURFACE)
+#  define NEED_DEFINE_OUTPUT_INITIALIZE 1
+#endif
+
 VALUE rb_cCairo_Device = Qnil;
 VALUE rb_cCairo_DRMDevice = Qnil;
 VALUE rb_cCairo_GLDevice = Qnil;
@@ -97,6 +101,7 @@ rb_cairo_device_from_ruby_object (VALUE obj)
   return device;
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
@@ -108,6 +113,7 @@ cr_object_holder_free (void *ptr)
 {
   rb_cairo__object_holder_free (rb_cCairo_Device, ptr);
 }
+#endif
 
 static void
 cr_device_free (void *ptr)
@@ -227,6 +233,7 @@ cr_finish_all_guarded_devices_at_end (VALUE data)
                    Qnil);
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static void
 yield_and_finish (VALUE self)
 {
@@ -238,6 +245,7 @@ yield_and_finish (VALUE self)
   if (!cairo_device_get_user_data (device, &cr_finished_key))
     cr_device_finish (self);
 }
+#endif
 
 #define DEFINE_OUTPUT_INITIALIZE(type)                                  \
 static VALUE                                                            \

data/ext/cairo/rb_cairo_font_face.c

@@ -211,7 +211,7 @@ cr_user_font_face_invoke_rescue (VALUE user_data, VALUE exception)
   data = (cr_user_font_face_invoke_data_t *)user_data;
   *(data->status) = rb_cairo__exception_to_status (exception);
 
-  if (*(data->status) == -1)
+  if (*(data->status) == (cairo_status_t)-1)
     rb_exc_raise (exception);
 
   return Qnil;

data/ext/cairo/rb_cairo_surface.c

@@ -62,6 +62,8 @@ VALUE rb_cCairo_Surface;
 VALUE rb_cCairo_ImageSurface;
 VALUE rb_cCairo_PDFSurface = Qnil;
 VALUE rb_cCairo_PSSurface = Qnil;
+VALUE rb_cCairo_XLibSurface = Qnil;
+VALUE rb_cCairo_XCBSurface = Qnil;
 VALUE rb_cCairo_SVGSurface = Qnil;
 VALUE rb_cCairo_Win32Surface = Qnil;
 VALUE rb_cCairo_Win32PrintingSurface = Qnil;
@@ -129,6 +131,12 @@ cr_surface_get_klass (cairo_surface_t *surface)
     case CAIRO_SURFACE_TYPE_PS:
       klass = rb_cCairo_PSSurface;
       break;
+    case CAIRO_SURFACE_TYPE_XLIB:
+      klass = rb_cCairo_XLibSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_XCB:
+      klass = rb_cCairo_XCBSurface;
+      break;
     case CAIRO_SURFACE_TYPE_QUARTZ:
       klass = rb_cCairo_QuartzSurface;
       break;
@@ -978,6 +986,24 @@ cr_pdf_surface_restrict_to_version (VALUE self, VALUE version)
 #  endif
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+static VALUE
+cr_xlib_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  rb_notimplement();
+  return Qnil;
+}
+#endif
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+static VALUE
+cr_xcb_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  rb_notimplement();
+  return Qnil;
+}
+#endif
+
 #ifdef CAIRO_HAS_SVG_SURFACE
 /* SVG-surface functions */
 DEFINE_SURFACE(svg)
@@ -1720,6 +1746,20 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+  /* XLib-surface */
+  INIT_SURFACE(xlib, XLib)
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_XLibSurface);
+#endif
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+  /* XLib-surface */
+  INIT_SURFACE(xcb, XCB)
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_XCBSurface);
+#endif
+
 #ifdef CAIRO_HAS_SVG_SURFACE
   /* SVG-surface */
   INIT_SURFACE(svg, SVG)

data/lib/cairo.rb

@@ -12,7 +12,7 @@ if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
   else
     require 'rbconfig'
     ENV['PATH'] = %w(bin lib).collect do |dir|
-      "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
+      "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
     end.join('') + ENV['PATH']
   end
 end
@@ -40,7 +40,7 @@ require 'cairo/color'
 require 'cairo/paper'
 
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/cairo.so"
 rescue LoadError
   require 'cairo.so'
@@ -128,7 +128,7 @@ module Cairo
     def rotate(radians); dup.rotate!(radians); end
     def invert; dup.invert!; end
     def multiply(other); dup.multiply!(other); end
-    alias * multiply
+    alias_method :*, :multiply
   end
 
   class FontOptions

data/lib/cairo/color.rb

@@ -11,7 +11,7 @@ module Cairo
         when :hsv, :hsva
           HSV.new(*value[1..-1])
         else
-          type, *value = value if [:rgb, :rgba].include?(value.first)
+          _, *value = value if [:rgb, :rgba].include?(value.first)
           RGB.new(*value)
         end
       when /\A#/ #
@@ -35,11 +35,11 @@ module Cairo
     def parse_hex_color(value)
       case value
       when /\A#((?:#{HEX_RE}){3,4})\z/ #
-        RGB.new(*$1.scan(/./).collect {|value| value.hex / 15.0})
+        RGB.new(*$1.scan(/./).collect {|part| part.hex / 15.0})
       when /\A#((?:#{HEX_RE}{2,2}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{2,2}/).collect {|value| value.hex / 255.0})
+        RGB.new(*$1.scan(/.{2,2}/).collect {|part| part.hex / 255.0})
       when /\A#((?:#{HEX_RE}{4,4}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{4,4}/).collect {|value| value.hex / 65535.0})
+        RGB.new(*$1.scan(/.{4,4}/).collect {|part| part.hex / 65535.0})
       else
         message = "invalid hex color format: #{value} should be "
         message << "#RGB, #RGBA, #RRGGBB, #RRGGBBAA, #RRRRGGGGBBBB "

data/lib/cairo/context/path.rb

@@ -25,7 +25,8 @@ module Cairo
           d = x
           i = -1
           type = points = nil
-          path.each do |type, points|
+          path.each do |_type, _points|
+            type, points = _type, _points
             i += 1
             break if d < parameterized_path[i]
             d -= parameterized_path[i]

data/test/run-test.rb

@@ -5,7 +5,7 @@ ext_dir = File.join(base_dir, "ext", "cairo")
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
-if system("which make > /dev/null")
+if system("which make >/dev/null 2>&1")
   Dir.chdir(base_dir) do
     system("make > /dev/null") or exit(1)
   end

data/test/test_context.rb

@@ -74,7 +74,7 @@ class ContextTest < Test::Unit::TestCase
     face = context.font_face
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_font_face.rb

@@ -9,7 +9,7 @@ class FontFaceTest < Test::Unit::TestCase
     face = Cairo::ToyFontFace.new
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_recording_surface.rb

@@ -13,6 +13,9 @@ class RecordingSurfaceTest < Test::Unit::TestCase
       context.line_to(80, 100)
       context.stroke
     end
-    assert_equal([10.0, 20.0, 99.0, 109.0], surface.ink_extents)
+    # https://bugs.freedesktop.org/show_bug.cgi?id=24688
+    # causes expected value change. It is introduced between
+    # cairo 1.10.0 and 1.10.2.
+    assert_equal([14.0, 29.0, 67.0, 72.0], surface.ink_extents)
   end
 end

data/test/test_xml_surface.rb

@@ -24,7 +24,8 @@ class XMLSurfaceTest < Test::Unit::TestCase
   <source-pattern>
     <solid>0 0 0 1</solid>
   </source-pattern>
-  <path> 15 30 m 80 100 l  </path>  <tolerance>0.1</tolerance>
+  <path> 15 30 m 80 100 l</path>
+  <tolerance>0.1</tolerance>
   <antialias>ANTIALIAS_DEFAULT</antialias>
 </stroke>
 EOX

data/vendor/local/bin/freetype-config

@@ -0,0 +1,160 @@
+#! /bin/sh
+#
+# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+prefix=`dirname $0`/..
+exec_prefix=${prefix}
+exec_prefix_set=no
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib
+enable_shared=
+wl=-Wl,
+hardcode_libdir_flag_spec='-L$libdir'
+
+usage()
+{
+  cat <<EOF
+Usage: freetype-config [OPTION]...
+Get FreeType compilation and linking information.
+
+Options:
+  --prefix               display \`--prefix' value used for building the
+                         FreeType library
+  --prefix=PREFIX        override \`--prefix' value with PREFIX
+  --exec-prefix          display \`--exec-prefix' value used for building
+                         the FreeType library
+  --exec-prefix=EPREFIX  override \`--exec-prefix' value with EPREFIX
+  --version              display libtool version of the FreeType library
+  --ftversion            display FreeType version number
+  --libs                 display flags for linking with the FreeType library
+  --libtool              display library name for linking with libtool
+  --cflags               display flags for compiling with the FreeType
+                         library
+EOF
+  exit $1
+}
+
+if test $# -eq 0 ; then
+  usage 1 1>&2
+fi
+
+while test $# -gt 0 ; do
+  case "$1" in
+  -*=*)
+    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+    ;;
+  *)
+    optarg=
+    ;;
+  esac
+
+  case $1 in
+  --prefix=*)
+    prefix=$optarg
+    local_prefix=yes
+    ;;
+  --prefix)
+    echo_prefix=yes
+    ;;
+  --exec-prefix=*)
+    exec_prefix=$optarg
+    exec_prefix_set=yes
+    local_prefix=yes
+    ;;
+  --exec-prefix)
+    echo_exec_prefix=yes
+    ;;
+  --version)
+    echo 12.0.6
+    exit 0
+    ;;
+  --ftversion)
+    echo_ft_version=yes
+    ;;
+  --cflags)
+    echo_cflags=yes
+    ;;
+  --libs)
+    echo_libs=yes
+    ;;
+  --libtool)
+    echo_libtool=yes
+    ;;
+  *)
+    usage 1 1>&2
+    ;;
+  esac
+  shift
+done
+
+if test "$local_prefix" = "yes" ; then
+  if test "$exec_prefix_set" != "yes" ; then
+    exec_prefix=$prefix
+  fi
+fi
+
+if test "$echo_prefix" = "yes" ; then
+  echo ${SYSROOT}$prefix
+fi
+
+if test "$echo_exec_prefix" = "yes" ; then
+  echo ${SYSROOT}$exec_prefix
+fi
+
+if test "$exec_prefix_set" = "yes" ; then
+  libdir=$exec_prefix/lib
+else
+  if test "$local_prefix" = "yes" ; then
+    includedir=$prefix/include
+    libdir=$prefix/lib
+  fi
+fi
+
+if test "$echo_ft_version" = "yes" ; then
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+         | grep FREETYPE_MAJOR \
+         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+         | grep FREETYPE_MINOR \
+         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+         | grep FREETYPE_PATCH \
+         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
+  echo $major.$minor.$patch
+fi
+
+if test "$echo_cflags" = "yes" ; then
+  cflags="-I${SYSROOT}$includedir/freetype2"
+  if test "${SYSROOT}$includedir" != "/usr/include" ; then
+    echo $cflags -I${SYSROOT}$includedir
+  else
+    echo $cflags
+  fi
+fi
+
+if test "$echo_libs" = "yes" ; then
+  rpath=
+  if test "$enable_shared" = "yes" ; then
+    eval "rpath=\"$hardcode_libdir_flag_spec\""
+  fi
+  libs="-lfreetype  "
+  if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
+    echo -L${SYSROOT}$libdir $libs
+  else
+    echo $libs
+  fi
+fi
+
+if test "$echo_libtool" = "yes" ; then
+  convlib="libfreetype.la"
+  echo ${SYSROOT}$libdir/$convlib
+fi
+
+# EOF

data/vendor/local/etc/fonts/fonts.dtd

@@ -0,0 +1,224 @@
+<!-- This is the Document Type Definition for font configuration files -->
+<!ELEMENT fontconfig (dir | 
+		      cache | 
+		      cachedir |
+		      include | 
+		      config |
+		      selectfont |
+		      match | 
+		      alias)* >
+
+<!-- 
+    Add a directory that provides fonts
+-->
+<!ELEMENT dir (#PCDATA)>
+<!ATTLIST dir xml:space (default|preserve) 'preserve'>
+
+<!--
+    Define the per-user file that holds cache font information.
+
+    If the filename begins with '~', it is replaced with the users
+    home directory path.
+-->
+<!ELEMENT cache (#PCDATA)>
+<!ATTLIST cache xml:space (default|preserve) 'preserve'>
+
+<!--
+    Add a directory that is searched for font cache files.
+    These hold per-directory cache data and are searched in
+    order for each directory. When writing cache files, the first
+    directory which allows the cache file to be created is used.
+
+    A leading '~' in a directory name is replaced with the users
+    home directory path.
+-->
+<!ELEMENT cachedir (#PCDATA)>
+<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
+
+<!--
+    Reference another configuration file; note that this
+    is another complete font configuration file and not
+    just a file included by the XML parser.
+
+    Set 'ignore_missing' to 'yes' if errors are to be ignored.
+
+    If the filename begins with '~', it is replaced with the users
+    home directory path.
+-->
+<!ELEMENT include (#PCDATA)>
+<!ATTLIST include
+	  ignore_missing    (no|yes)		"no"
+	  xml:space	    (default|preserve)	"preserve">
+
+<!--
+    Global library configuration data
+ -->
+<!ELEMENT config (blank|rescan)*>
+
+<!--
+    Specify the set of Unicode encoding values which
+    represent glyphs that are allowed to contain no
+    data.  With this list, fontconfig can examine
+    fonts for broken glyphs and eliminate them from
+    the set of valid Unicode chars.  This idea
+    was borrowed from Mozilla
+ -->
+<!ELEMENT blank (int)*>
+
+<!--
+    Aliases are just a special case for multiple match elements
+
+    They are syntactically equivalent to:
+
+    <match>
+	<test name="family">
+	    <string value=[family]/>
+	</test>
+	<edit name="family" mode="prepend">
+	    <string value=[prefer]/>
+	    ...
+	</edit>
+	<edit name="family" mode="append">
+	    <string value=[accept]/>
+	    ...
+	</edit>
+	<edit name="family" mode="append_last">
+	    <string value=[default]/>
+	    ...
+	</edit>
+    </match>
+-->
+<!--
+    Periodically rescan the font configuration and
+    directories to synch internal state with filesystem
+ -->
+<!ELEMENT rescan (int)>
+
+<!--
+    Edit list of available fonts at startup/reload time
+ -->
+<!ELEMENT selectfont (rejectfont | acceptfont)* >
+
+<!ELEMENT rejectfont (glob | pattern)*>
+
+<!ELEMENT acceptfont (glob | pattern)*>
+
+<!ELEMENT glob (#PCDATA)>
+
+<!ELEMENT pattern (patelt)*>
+
+<!ENTITY % constant 'int|double|string|matrix|bool|charset|const'>
+
+<!ELEMENT patelt (%constant;)*>
+<!ATTLIST patelt
+	  name CDATA	#REQUIRED>
+
+<!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ATTLIST alias
+	  binding (weak|strong|same) "weak">
+<!ELEMENT prefer (family)*>
+<!ELEMENT accept (family)*>
+<!ELEMENT default (family)*>
+<!ELEMENT family (#PCDATA)>
+<!ATTLIST family xml:space (default|preserve) 'preserve'>
+
+<!ENTITY % expr 'int|double|string|matrix|bool|charset
+		|name|const
+		|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
+		|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
+
+<!--
+    Match and edit patterns.
+
+    If 'target' is 'pattern', execute the match before selecting a font.
+    if 'target' is 'font', execute the match on the result of a font
+    selection.
+-->
+<!ELEMENT match (test*, edit*)>
+<!ATTLIST match
+	  target (pattern|font|scan) "pattern">
+
+<!--
+    Match a field in a pattern
+
+    if 'qual' is 'any', then the match succeeds if any value in the field matches.
+    if 'qual' is 'all', then the match succeeds only if all values match.
+    if 'qual' is 'first', then the match succeeds only if the first value matches.
+    if 'qual' is 'not_first', then the match succeeds only if any value other than
+    	the first matches.
+    For match elements with target=font, if test 'target' is 'pattern',
+    then the test is applied to the pattern used in matching rather than
+    to the resulting font.
+
+    Match elements with target=scan are applied as fonts are scanned.
+    They edit the pattern generated from the scanned font and affect
+    what the fontconfig database contains.
+-->
+<!ELEMENT test (%expr;)*>
+<!ATTLIST test 
+	  qual (any|all|first|not_first)    "any"
+	  name CDATA	    #REQUIRED
+	  target (pattern|font|default)		"default"
+	  compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)	"eq">
+
+<!--
+    Edit a field in a pattern
+
+    The enclosed values are used together to edit the list of values
+    associated with 'name'.
+
+    If 'name' matches one of those used in a test element for this match element:
+	if 'mode' is 'assign', replace the matched value.
+	if 'mode' is 'assign_replace', replace all of the values
+	if 'mode' is 'prepend', insert before the matched value
+	if 'mode' is 'append', insert after the matched value
+	if 'mode' is 'prepend_first', insert before all of the values
+	if 'mode' is 'append_last', insert after all of the values
+    If 'name' doesn't match any of those used in a test element:
+	if 'mode' is 'assign' or 'assign_replace, replace all of the values
+	if 'mode' is 'prepend' or 'prepend_first', insert before all of the values
+	if 'mode' is 'append' or 'append_last', insert after all of the values
+-->
+<!ELEMENT edit (%expr;)*>
+<!ATTLIST edit
+	  name CDATA	    #REQUIRED
+	  mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
+	  binding (weak|strong|same) "weak">
+
+<!--
+    Elements of expressions follow
+-->
+<!ELEMENT int (#PCDATA)>
+<!ATTLIST int xml:space (default|preserve) 'preserve'>
+<!ELEMENT double (#PCDATA)>
+<!ATTLIST double xml:space (default|preserve) 'preserve'>
+<!ELEMENT string (#PCDATA)>
+<!ATTLIST string xml:space (default|preserve) 'preserve'>
+<!ELEMENT matrix (double,double,double,double)>
+<!ELEMENT bool (#PCDATA)>
+<!ELEMENT charset (#PCDATA)>
+<!ATTLIST charset xml:space (default|preserve) 'preserve'>
+<!ELEMENT name (#PCDATA)>
+<!ATTLIST name xml:space (default|preserve) 'preserve'>
+<!ELEMENT const (#PCDATA)>
+<!ATTLIST const xml:space (default|preserve) 'preserve'>
+<!ELEMENT or (%expr;)*>
+<!ELEMENT and (%expr;)*>
+<!ELEMENT eq ((%expr;), (%expr;))>
+<!ELEMENT not_eq ((%expr;), (%expr;))>
+<!ELEMENT less ((%expr;), (%expr;))>
+<!ELEMENT less_eq ((%expr;), (%expr;))>
+<!ELEMENT more ((%expr;), (%expr;))>
+<!ELEMENT more_eq ((%expr;), (%expr;))>
+<!ELEMENT contains ((%expr;), (%expr;))>
+<!ELEMENT not_contains ((%expr;), (%expr;))>
+<!ELEMENT plus (%expr;)*>
+<!ELEMENT minus (%expr;)*>
+<!ELEMENT times (%expr;)*>
+<!ELEMENT divide (%expr;)*>
+<!ELEMENT not (%expr;)>
+<!ELEMENT if ((%expr;), (%expr;), (%expr;))>
+<!ELEMENT floor (%expr;)>
+<!ELEMENT ceil (%expr;)>
+<!ELEMENT round (%expr;)>
+<!ELEMENT trunc (%expr;)>