cairo 1.10.2-x86-mingw32 → 1.12.0-x86-mingw32

data/AUTHORS

@@ -1,4 +1,7 @@
+Active:
+Kouhei Sutou <kou@cozmixng.org>
+
+Inactive:
 Evan Marin   <martine@danga.com>
 Øyvind Kolås <oeyvindk@hig.no>
 MenTaLguY    <mental@rydia.net>
-Kouhei Sutou <kou@cozmixng.org>

data/Gemfile

@@ -2,14 +2,4 @@
 
 source "http://rubygems.org/"
 
-gem 'pkg-config'
-
-group :development, :test do
-  gem "test-unit"
-  gem "test-unit-notify"
-  gem "rake"
-  gem "rake-compiler"
-  gem "jeweler"
-  gem "yard"
-  gem "packnga"
-end
+gemfile

data/NEWS

@@ -1,3 +1,31 @@
+Release 1.12.0 (2012-03-25) Kouhei Sutou <kou@cozmixng.org>)
+============================================================
+
+Improvements
+------------
+
+  * Supported cairo 1.12.0.
+    * Cairo::Surface#supported_mime_type?
+    * Cairo::Surface#create_similar_image
+    * Cairo::Surface#map_to_image
+    * Cairo::Surface#unmap_to_image
+    * Cairo::RecordingSurface#extents
+    * Cairo::MeshPattern
+    * Cairo::RasterSourcePattern
+    * Cairo::MimeType::UNIQUE_ID
+  * Supported glesv2 surface.
+
+Fixes
+-----
+
+  * Fixed a bug that Cairo::HINT_METRICS_ON can't be specified. #8
+    [Vasily Fedoseyev]
+
+Thanks
+------
+
+  * Vasily Fedoseyev
+
 Release 1.10.2 (2011-11-20) Kouhei Sutou <kou@cozmixng.org>)
 ============================================================
 

data/README.rdoc

@@ -13,7 +13,7 @@ http://cairographics.org/
 == Dependencies
 
 * ruby >= 1.8 (1.9.2 also supported!)
-* cairo >= 1.2.0 (1.10.0 also supported!)
+* cairo >= 1.2.0 (1.12.0 also supported!)
 
 == Install
 
@@ -51,7 +51,7 @@ Options to extconf.rb:
 
 == Windows
 
-cairo-X.Y.Z-x86-mswin32.gem includes cairo related binaries.
+cairo-X.Y.Z-x86-mingw32.gem includes cairo related binaries.
 
 * cairo related binaries:
   http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
@@ -114,3 +114,4 @@ http://cairographics.org/cgi-bin/mailman/listinfo/cairo
 * Mamoru Tasaka: reports a bug.
 * Nikolai Weibull: reports problems.
 * Will Bryant: reports a bug.
+* Vasily Fedoseyev: fixes a bug.

data/Rakefile

@@ -7,7 +7,7 @@ require 'fileutils'
 require 'rubygems'
 require 'rubygems/package_task'
 require 'yard'
-require 'jeweler'
+require 'bundler/gem_helper'
 require 'rake/extensiontask'
 require 'packnga'
 
@@ -19,50 +19,9 @@ $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
 
-def guess_rcairo_version(cairo_ext_dir)
-  version = {}
-  File.open(File.join(cairo_ext_dir, "rb_cairo.h")) do |rb_cairo_h|
-    rb_cairo_h.each_line do |line|
-      case line
-      when /\A#define RB_CAIRO_VERSION_([A-Z]+) (\d+)/
-        version[$1.downcase] = $2
-      end
-    end
-  end
-  [version["major"], version["minor"], version["micro"]].join(".")
-end
-
-ENV["VERSION"] ||= guess_rcairo_version(cairo_ext_dir)
-version = ENV["VERSION"].dup
-spec = nil
-Jeweler::Tasks.new do |_spec|
-  spec = _spec
-  spec.name = "cairo"
-  spec.version = version
-  spec.rubyforge_project = 'cairo'
-  spec.homepage = 'http://cairographics.org/rcairo'
-  authors = File.join(base_dir, "AUTHORS")
-  spec.authors = File.readlines(authors).collect do |line|
-    if /\s*<[^<>]*>$/ =~ line
-      $PREMATCH
-    else
-      nil
-    end
-  end.compact
-  spec.email = ['cairo@cairographics.org']
-  spec.summary = 'Ruby bindings for cairo'
-  spec.description = "Ruby bindings for cairo"
-  spec.license = "Ruby's"
-  spec.files = FileList["{lib,samples}/**/*.rb",
-                        "ext/**/{*.def,depend,*.rb,*.c,*.h}",
-                        "AUTHORS", "COPYING", "GPL", "Gemfile",
-                        "NEWS", "README.rdoc", "Rakefile"]
-  spec.test_files = FileList["test/**/*.rb"]
-end
-
-Rake::Task["release"].prerequisites.clear
-Jeweler::RubygemsDotOrgTasks.new do
-end
+helper = Bundler::GemHelper.new(base_dir)
+helper.install
+spec = helper.gemspec
 
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true
@@ -138,7 +97,7 @@ end
 
 # for releasing
 task :dist do
-  sh "./dist.sh", version
+  sh "./dist.sh", spec.version
 end
 
 # for documentation

data/ext/cairo/cairo.def

@@ -2,6 +2,7 @@ EXPORTS
     Init_cairo
     rb_mCairo                 DATA
     rb_cCairo_Context         DATA
+    rb_cCairo_Rectangle       DATA
     rb_cCairo_Path            DATA
     rb_cCairo_PathData        DATA
     rb_cCairo_PathMoveTo      DATA
@@ -10,12 +11,16 @@ EXPORTS
     rb_cCairo_PathClosePath   DATA
     rb_cCairo_Matrix          DATA
     rb_cCairo_Region          DATA
+
     rb_cCairo_Pattern         DATA
     rb_cCairo_SolidPattern    DATA
     rb_cCairo_SurfacePattern  DATA
     rb_cCairo_GradientPattern DATA
     rb_cCairo_LinearPattern   DATA
     rb_cCairo_RadialPattern   DATA
+    rb_cCairo_MeshPattern     DATA
+    rb_cCairo_RasterSourcePattern DATA
+
     rb_cCairo_FontFace        DATA
     rb_cCairo_ToyFontFace     DATA
     rb_cCairo_UserFontFace    DATA
@@ -46,6 +51,8 @@ EXPORTS
     rb_cCairo_XMLSurface      DATA
     rb_cCairo_SkiaSurface     DATA
     rb_cCairo_SubSurface      DATA
+    rb_cCairo_CoglSurface     DATA
+
     rb_cCairo_Device          DATA
     rb_cCairo_DRMDevice       DATA
     rb_cCairo_GLDevice        DATA
@@ -53,6 +60,8 @@ EXPORTS
     rb_cCairo_XCBDevice       DATA
     rb_cCairo_XlibDevice      DATA
     rb_cCairo_XMLDevice       DATA
+    rb_cCairo_CoglDevice      DATA
+    rb_cCairo_Win32Device     DATA
 
     rb_mCairo_Operator        DATA
     rb_mCairo_Antialias       DATA

data/ext/cairo/rb_cairo.h

@@ -72,11 +72,12 @@ RB_CAIRO_BEGIN_DECLS
 #endif
 
 #define RB_CAIRO_VERSION_MAJOR 1
-#define RB_CAIRO_VERSION_MINOR 10
-#define RB_CAIRO_VERSION_MICRO 2
+#define RB_CAIRO_VERSION_MINOR 12
+#define RB_CAIRO_VERSION_MICRO 0
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
+RB_CAIRO_VAR VALUE rb_cCairo_Rectangle;
 RB_CAIRO_VAR VALUE rb_cCairo_Point;
 RB_CAIRO_VAR VALUE rb_cCairo_Path;
 RB_CAIRO_VAR VALUE rb_cCairo_PathData;
@@ -92,6 +93,8 @@ RB_CAIRO_VAR VALUE rb_cCairo_SurfacePattern;
 RB_CAIRO_VAR VALUE rb_cCairo_GradientPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_LinearPattern;
 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_ToyFontFace;
 RB_CAIRO_VAR VALUE rb_cCairo_UserFontFace;
@@ -161,6 +164,8 @@ RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 
+#define RVAL2POINTER(obj)       ((void *)(obj))
+#define POINTER2RVAL(pointer)   ((VALUE)(pointer))
 
 #define RVAL2CRCONTEXT(obj)     (rb_cairo_context_from_ruby_object(obj))
 #define CRCONTEXT2RVAL(cr)      (rb_cairo_context_to_ruby_object(cr))

data/ext/cairo/rb_cairo_constants.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2012 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -48,7 +48,11 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #endif
 
 #define CAIRO_ANTIALIAS_MIN CAIRO_ANTIALIAS_DEFAULT
-#define CAIRO_ANTIALIAS_MAX CAIRO_ANTIALIAS_SUBPIXEL
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+#  define CAIRO_ANTIALIAS_MAX CAIRO_ANTIALIAS_BEST
+#else
+#  define CAIRO_ANTIALIAS_MAX CAIRO_ANTIALIAS_SUBPIXEL
+#endif
 
 #define CAIRO_FILL_RULE_MIN CAIRO_FILL_RULE_WINDING
 #define CAIRO_FILL_RULE_MAX CAIRO_FILL_RULE_EVEN_ODD
@@ -72,7 +76,7 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #define CAIRO_HINT_STYLE_MAX CAIRO_HINT_STYLE_FULL
 
 #define CAIRO_HINT_METRICS_MIN CAIRO_HINT_METRICS_DEFAULT
-#define CAIRO_HINT_METRICS_MAX CAIRO_HINT_METRICS_OFF
+#define CAIRO_HINT_METRICS_MAX CAIRO_HINT_METRICS_ON
 
 #define CAIRO_PATH_MIN CAIRO_PATH_MOVE_TO
 #define CAIRO_PATH_MAX CAIRO_PATH_CLOSE_PATH
@@ -80,8 +84,16 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #define CAIRO_CONTENT_MIN CAIRO_CONTENT_COLOR
 #define CAIRO_CONTENT_MAX CAIRO_CONTENT_COLOR_ALPHA
 
-#define CAIRO_FORMAT_MIN CAIRO_FORMAT_ARGB32
-#define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+#  define CAIRO_FORMAT_MIN CAIRO_FORMAT_INVALID
+#else
+#  define CAIRO_FORMAT_MIN CAIRO_FORMAT_ARGB32
+#endif
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+#  define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB30
+#else
+#  define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
+#endif
 
 #define CAIRO_EXTEND_MIN CAIRO_EXTEND_NONE
 #define CAIRO_EXTEND_MAX CAIRO_EXTEND_PAD
@@ -101,8 +113,14 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #define CAIRO_TEXT_CLUSTER_FLAG_MIN 0
 #define CAIRO_TEXT_CLUSTER_FLAG_MAX CAIRO_TEXT_CLUSTER_FLAG_BACKWARD
 
-#define CAIRO_SCRIPT_MODE_MIN CAIRO_SCRIPT_MODE_BINARY
-#define CAIRO_SCRIPT_MODE_MAX CAIRO_SCRIPT_MODE_ASCII
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+#  define CAIRO_SCRIPT_MODE_MIN CAIRO_SCRIPT_MODE_ASCII
+#  define CAIRO_SCRIPT_MODE_MAX CAIRO_SCRIPT_MODE_BINARY
+#else
+#  define CAIRO_SCRIPT_MODE_MIN CAIRO_SCRIPT_MODE_BINARY
+#  define CAIRO_SCRIPT_MODE_MAX CAIRO_SCRIPT_MODE_ASCII
+#endif
+
 
 #define CAIRO_REGION_OVERLAP_MIN CAIRO_REGION_OVERLAP_IN
 #define CAIRO_REGION_OVERLAP_MAX CAIRO_REGION_OVERLAP_PART
@@ -386,6 +404,14 @@ Init_cairo_constants (void)
                    INT2FIX (CAIRO_ANTIALIAS_GRAY));
   rb_define_const (rb_mCairo_Antialias,    "SUBPIXEL",
                    INT2FIX (CAIRO_ANTIALIAS_SUBPIXEL));
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_const (rb_mCairo_Antialias,    "FAST",
+                   INT2FIX (CAIRO_ANTIALIAS_FAST));
+  rb_define_const (rb_mCairo_Antialias,    "GOOD",
+                   INT2FIX (CAIRO_ANTIALIAS_GOOD));
+  rb_define_const (rb_mCairo_Antialias,    "BEST",
+                   INT2FIX (CAIRO_ANTIALIAS_BEST));
+#endif
 
 
   /* cairo_fill_rule_t */
@@ -510,6 +536,10 @@ Init_cairo_constants (void)
                    INT2FIX (CAIRO_FORMAT_A1));
   rb_define_const (rb_mCairo_Format,    "RGB16_565",
                    INT2FIX (CAIRO_FORMAT_RGB16_565));
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_const (rb_mCairo_Format,    "RGB30",
+                   INT2FIX (CAIRO_FORMAT_RGB30));
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 5, 8)
   rb_define_singleton_method (rb_mCairo_Format, "stride_for_width",
@@ -616,7 +646,13 @@ Init_cairo_constants (void)
                    rb_str_new2 (CAIRO_MIME_TYPE_JP2));
   rb_define_const (rb_mCairo_MimeType, "URI",
                    rb_str_new2 (CAIRO_MIME_TYPE_URI));
+#endif
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_const (rb_mCairo_MimeType, "UNIQUE_ID",
+                   rb_str_new2 (CAIRO_MIME_TYPE_UNIQUE_ID));
+#endif
 
+#if CAIRO_CHECK_VERSION(1, 10, 0)
   rb_mCairo_RegionOverlap = rb_define_module_under (rb_mCairo, "RegionOverlap");
 
   rb_define_const (rb_mCairo_RegionOverlap, "IN",

data/ext/cairo/rb_cairo_context.c

@@ -23,6 +23,7 @@
 #endif
 
 VALUE rb_cCairo_Context;
+VALUE rb_cCairo_Rectangle;
 
 static ID cr_id_surface, cr_id_source;
 static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
@@ -33,7 +34,6 @@ static cairo_user_data_key_t cr_object_holder_key;
 static VALUE cr_get_current_point (VALUE self);
 
 #if CAIRO_CHECK_VERSION(1, 3, 0)
-static VALUE rb_cCairo_Rectangle;
 static ID at_x, at_y, at_width, at_height;
 
 static VALUE

data/ext/cairo/rb_cairo_device.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2010-2012 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -33,6 +33,8 @@ VALUE rb_cCairo_ScriptDevice = Qnil;
 VALUE rb_cCairo_XCBDevice = Qnil;
 VALUE rb_cCairo_XlibDevice = Qnil;
 VALUE rb_cCairo_XMLDevice = Qnil;
+VALUE rb_cCairo_CoglDevice = Qnil;
+VALUE rb_cCairo_Win32Device = Qnil;
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
 
@@ -75,6 +77,14 @@ cr_device_get_klass (cairo_device_t *device)
     case CAIRO_DEVICE_TYPE_XML:
       klass = rb_cCairo_XMLDevice;
       break;
+#  if CAIRO_CHECK_VERSION(1, 11, 4)
+    case CAIRO_DEVICE_TYPE_COGL:
+      klass = rb_cCairo_CoglDevice;
+      break;
+    case CAIRO_DEVICE_TYPE_WIN32:
+      klass = rb_cCairo_Win32Device;
+      break;
+#  endif
     default:
       klass = rb_cCairo_Device;
       break;
@@ -376,10 +386,15 @@ Init_cairo_device (void)
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_Device);
 
-#  ifdef CAIRO_HAS_SCRIPT_SURFACE
+  rb_cCairo_DRMDevice =
+    rb_define_class_under (rb_mCairo, "DRMDevice", rb_cCairo_Device);
+
+  rb_cCairo_GLDevice =
+    rb_define_class_under (rb_mCairo, "GLDevice", rb_cCairo_Device);
+
   rb_cCairo_ScriptDevice =
     rb_define_class_under (rb_mCairo, "ScriptDevice", rb_cCairo_Device);
-
+#  ifdef CAIRO_HAS_SCRIPT_SURFACE
   rb_define_method (rb_cCairo_ScriptDevice, "initialize",
                     cr_script_device_initialize, 1);
 
@@ -397,10 +412,15 @@ Init_cairo_device (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_ScriptDevice);
 #  endif
 
-#  ifdef CAIRO_HAS_XML_SURFACE
+  rb_cCairo_XCBDevice =
+    rb_define_class_under (rb_mCairo, "XCBDevice", rb_cCairo_Device);
+
+  rb_cCairo_XlibDevice =
+    rb_define_class_under (rb_mCairo, "XlibDevice", rb_cCairo_Device);
+
   rb_cCairo_XMLDevice =
     rb_define_class_under (rb_mCairo, "XMLDevice", rb_cCairo_Device);
-
+#  ifdef CAIRO_HAS_XML_SURFACE
   rb_define_method (rb_cCairo_XMLDevice, "initialize",
                     cr_xml_device_initialize, 1);
 
@@ -410,5 +430,11 @@ Init_cairo_device (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_XMLDevice);
 #  endif
 
+  rb_cCairo_CoglDevice =
+    rb_define_class_under (rb_mCairo, "CoglDevice", rb_cCairo_Device);
+
+  rb_cCairo_Win32Device =
+    rb_define_class_under (rb_mCairo, "Win32Device", rb_cCairo_Device);
+
 #endif
 }

data/ext/cairo/rb_cairo_exception.c

@@ -57,6 +57,10 @@ static VALUE rb_eCairo_UserFontNotImplemented;
 static VALUE rb_eCairo_DeviceTypeMismatch;
 static VALUE rb_eCairo_DeviceError;
 #endif
+#if CAIRO_CHECK_VERSION(1, 11, 2)
+static VALUE rb_eCairo_InvalidMeshConstruction;
+static VALUE rb_eCairo_DeviceFinished;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -179,10 +183,18 @@ rb_cairo_check_status (cairo_status_t status)
     case CAIRO_STATUS_DEVICE_ERROR:
       rb_raise (rb_eCairo_DeviceError, "%s", string);
       break;
+#endif
+#if CAIRO_CHECK_VERSION(1, 11, 2)
+    case CAIRO_STATUS_INVALID_MESH_CONSTRUCTION:
+      rb_raise (rb_eCairo_InvalidMeshConstruction, "%s", string);
+      break;
+    case CAIRO_STATUS_DEVICE_FINISHED:
+      rb_raise (rb_eCairo_DeviceFinished, "%s", string);
+      break;
+#endif
     case CAIRO_STATUS_LAST_STATUS:
       rb_raise (rb_eArgError, "bug: %s: %d", string, status);
       break;
-#endif
     }
 }
 
@@ -402,4 +414,12 @@ Init_cairo_exception ()
     rb_define_class_under (rb_mCairo, "DeviceError",
                            rb_eCairo_Error);
 #endif
+#if CAIRO_CHECK_VERSION(1, 11, 2)
+  rb_eCairo_InvalidMeshConstruction =
+    rb_define_class_under (rb_mCairo, "InvalidMeshConstruction",
+                           rb_eArgError);
+  rb_eCairo_DeviceFinished =
+    rb_define_class_under (rb_mCairo, "DeviceFinished",
+                           rb_eCairo_Error);
+#endif
 }