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

data/ext/cairo/rb_cairo_surface.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-11-01 14:23:14 $
  *
- * 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>
  *
@@ -54,7 +54,11 @@ enum ruby_value_type {
 #  include <cairo-tee.h>
 #endif
 
-#ifdef CAIRO_HAS_GL_SURFACE
+#if defined(CAIRO_HAS_GL_SURFACE) || defined(CAIRO_HAS_GLESV2_SURFACE)
+#  define RB_CAIRO_HAS_GL_SURFACE
+#endif
+
+#ifdef RB_CAIRO_HAS_GL_SURFACE
 #  include <cairo-gl.h>
 #endif
 
@@ -80,6 +84,7 @@ VALUE rb_cCairo_TeeSurface = Qnil;
 VALUE rb_cCairo_XMLSurface = Qnil;
 VALUE rb_cCairo_SkiaSurface = Qnil;
 VALUE rb_cCairo_SubSurface = Qnil;
+VALUE rb_cCairo_CoglSurface = Qnil;
 
 static ID cr_id_parse;
 static ID cr_id_size;
@@ -187,6 +192,11 @@ cr_surface_get_klass (cairo_surface_t *surface)
     case CAIRO_SURFACE_TYPE_SUBSURFACE:
       klass = rb_cCairo_SubSurface;
       break;
+#endif
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+    case CAIRO_SURFACE_TYPE_COGL:
+      klass = rb_cCairo_CoglSurface;
+      break;
 #endif
     default:
       klass = rb_cCairo_Surface;
@@ -310,8 +320,12 @@ yield_and_finish (VALUE self)
   rb_yield (self);
 
   surface = _SELF;
-  if (!cairo_surface_get_user_data (surface, &cr_finished_key))
-    cr_surface_finish (self);
+  if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
+    return;
+  if (cairo_surface_get_user_data (surface, &cr_finished_key))
+    return;
+
+  cr_surface_finish (self);
 }
 
 static VALUE
@@ -344,6 +358,94 @@ cr_surface_create_similar (int argc, VALUE *argv, VALUE self)
   return CRSURFACE2RVAL_WITH_DESTROY (similar_surface);
 }
 
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+static VALUE
+cr_surface_create_similar_image (int argc, VALUE *argv, VALUE self)
+{
+  cairo_surface_t *surface, *similar_image;
+  cairo_format_t format;
+  int width, height;
+  VALUE arg1, arg2, arg3;
+
+  rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
+
+  surface = _SELF;
+  if (argc == 2)
+    {
+      if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
+        {
+          format = cairo_image_surface_get_format (surface);
+        }
+      else
+        {
+          format = CAIRO_FORMAT_ARGB32;
+        }
+      width = NUM2INT (arg1);
+      height = NUM2INT (arg2);
+    }
+  else
+    {
+      format = RVAL2CRFORMAT (arg1);
+      width = NUM2INT (arg2);
+      height = NUM2INT (arg3);
+    }
+
+  similar_image = cairo_surface_create_similar_image (surface, format,
+                                                      width, height);
+  cr_surface_check_status (similar_image);
+  return CRSURFACE2RVAL_WITH_DESTROY (similar_image);
+}
+
+static VALUE
+cr_surface_map_to_image (int argc, VALUE *argv, VALUE self)
+{
+  cairo_surface_t *surface, *mapped_image;
+  cairo_rectangle_int_t extents_value;
+  cairo_rectangle_int_t *extents = NULL;
+  VALUE rb_extents;
+
+  rb_scan_args (argc, argv, "01", &rb_extents);
+
+  surface = _SELF;
+  if (!NIL_P (rb_extents))
+    {
+      extents = &extents_value;
+      if (rb_cairo__is_kind_of (rb_extents, rb_cCairo_Rectangle))
+        {
+          extents->x = NUM2INT (rb_iv_get (rb_extents, "@x"));
+          extents->y = NUM2INT (rb_iv_get (rb_extents, "@y"));
+          extents->width = NUM2INT (rb_iv_get (rb_extents, "@width"));
+          extents->height = NUM2INT (rb_iv_get (rb_extents, "@height"));
+        }
+      else
+        {
+          VALUE *values;
+          rb_extents = rb_convert_type (rb_extents, T_ARRAY, "Array", "to_ary");
+          values = RARRAY_PTR (rb_extents);
+          extents->x = NUM2INT (values[0]);
+          extents->y = NUM2INT (values[1]);
+          extents->height = NUM2INT (values[2]);
+          extents->width = NUM2INT (values[3]);
+        }
+    }
+
+  mapped_image = cairo_surface_map_to_image (surface, extents);
+  cr_surface_check_status (mapped_image);
+  return CRSURFACE2RVAL_WITH_DESTROY (mapped_image);
+}
+
+static VALUE
+cr_surface_unmap_image (VALUE self, VALUE rb_mapped_image)
+{
+  cairo_surface_t *surface, *mapped_image;
+
+  surface = _SELF;
+  mapped_image = RVAL2CRSURFACE (rb_mapped_image);
+  cairo_surface_unmap_image (surface, mapped_image);
+  return Qnil;
+}
+#endif
+
 #if CAIRO_CHECK_VERSION(1, 10, 0)
 static VALUE
 cr_surface_destroy_with_destroy_check (VALUE self)
@@ -477,6 +579,21 @@ cr_surface_set_mime_data (VALUE self, VALUE rb_mime_type, VALUE rb_data)
 }
 #endif
 
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+static VALUE
+cr_surface_supported_mime_type_p (VALUE self, VALUE rb_mime_type)
+{
+  cairo_surface_t *surface;
+  const char *mime_type;
+  cairo_bool_t supported_p;
+
+  surface = _SELF;
+  mime_type = StringValueCStr (rb_mime_type);
+  supported_p = cairo_surface_supports_mime_type (surface, mime_type);
+  return CBOOL2RVAL (supported_p);
+}
+#endif
+
 static VALUE
 cr_surface_get_font_options (VALUE self)
 {
@@ -807,6 +924,24 @@ cr_recording_surface_get_ink_extents (VALUE self)
                       rb_float_new (x), rb_float_new (y),
                       rb_float_new (width), rb_float_new (height));
 }
+
+#  if CAIRO_CHECK_VERSION(1, 11, 4)
+static VALUE
+cr_recording_surface_get_extents (VALUE self)
+{
+  cairo_surface_t *surface;
+  cairo_rectangle_t extents;
+
+  surface = _SELF;
+  cairo_recording_surface_get_extents (surface, &extents);
+  cr_surface_check_status (surface);
+  return rb_ary_new3 (4,
+                      rb_float_new (extents.x),
+                      rb_float_new (extents.y),
+                      rb_float_new (extents.width),
+                      rb_float_new (extents.height));
+}
+#  endif
 #endif
 
 /* Printing surfaces */
@@ -1457,14 +1592,14 @@ cr_tee_surface_array_reference (VALUE self, VALUE index)
 
   surface = _SELF;
   index = rb_Integer (index);
-  target = cairo_tee_surface_index (surface, NUM2INT (index));
+  target = cairo_tee_surface_index (surface, NUM2UINT (index));
   cr_surface_check_status (surface);
   cr_surface_check_status (target);
   return CRSURFACE2RVAL (target);
 }
 #endif
 
-#ifdef CAIRO_HAS_GL_SURFACE
+#ifdef RB_CAIRO_HAS_GL_SURFACE
 static VALUE
 cr_gl_surface_initialize (int argc, VALUE *argv, VALUE self)
 {
@@ -1621,6 +1756,14 @@ Init_cairo_surface (void)
 
   rb_define_method (rb_cCairo_Surface, "create_similar",
                     cr_surface_create_similar, -1);
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_method (rb_cCairo_Surface, "create_similar_image",
+                    cr_surface_create_similar_image, -1);
+  rb_define_method (rb_cCairo_Surface, "map_to_image",
+                    cr_surface_map_to_image, -1);
+  rb_define_method (rb_cCairo_Surface, "unmap_image",
+                    cr_surface_unmap_image, 1);
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
   rb_define_method (rb_cCairo_Surface, "sub_rectangle_surface",
                     cr_surface_create_sub_rectangle_surface, 4);
@@ -1637,6 +1780,11 @@ Init_cairo_surface (void)
   rb_define_method (rb_cCairo_Surface, "set_mime_data",
                     cr_surface_set_mime_data, 2);
 #endif
+#if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_method (rb_cCairo_Surface, "supported_mime_type?",
+                    cr_surface_supported_mime_type_p, 1);
+#endif
+
 
   rb_define_method (rb_cCairo_Surface, "font_options",
                     cr_surface_get_font_options, 0);
@@ -1699,6 +1847,10 @@ Init_cairo_surface (void)
 
   rb_define_method (rb_cCairo_RecordingSurface, "ink_extents",
                     cr_recording_surface_get_ink_extents, 0);
+#  if CAIRO_CHECK_VERSION(1, 11, 4)
+  rb_define_method (rb_cCairo_RecordingSurface, "extents",
+                    cr_recording_surface_get_extents, 0);
+#  endif
 #endif
 
 #define INIT_SURFACE(type, name)                                        \
@@ -1857,7 +2009,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_TeeSurface);
 #endif
 
-#ifdef CAIRO_HAS_GL_SURFACE
+#ifdef RB_CAIRO_HAS_GL_SURFACE
   rb_cCairo_GLSurface =
     rb_define_class_under (rb_mCairo, "GLSurface", rb_cCairo_Surface);
 

data/test/test_raster_source_pattern.rb

@@ -0,0 +1,148 @@
+require "cairo"
+require "tempfile"
+
+class RasterPatternSourceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def test_acquire_and_release
+    Cairo::ImageSurface.new(100, 100) do |surface|
+      Cairo::Context.new(surface) do |context|
+        context.set_source(1, 1, 1)
+        context.paint
+
+        called = []
+        red_pattern = Cairo::RasterSourcePattern.new(100, 100)
+        red_pattern.acquire do |pattern, target, extents|
+          called << :acquire
+          red_image = target.create_similar_image(extents.width, extents.height)
+          red_image.set_device_offset(extents.x, extents.y)
+          Cairo::Context.new(red_image) do |red_image_context|
+            red_image_context.set_source(1, 0, 0)
+            red_image_context.paint
+          end
+          red_image
+        end
+        red_pattern.release do |pattern, surface|
+          called << :release
+          surface.finish
+        end
+        context.set_source(red_pattern)
+        context.rectangle(40, 40, 20, 20)
+        context.fill
+        assert_equal([:acquire, :release], called)
+      end
+      show_result(surface)
+    end
+  end
+
+  class SnapshotTest < self
+    def test_success
+      Cairo::RecordingSurface.new(0, 0, 100, 100) do |surface|
+        Cairo::Context.new(surface) do |context|
+          called = []
+          raster_source = Cairo::RasterSourcePattern.new(100, 100)
+          raster_source.snapshot do |pattern|
+            called << :snapshot
+          end
+          context.set_source(raster_source)
+          context.rectangle(40, 40, 20, 20)
+          context.fill
+          assert_equal([:snapshot], called)
+        end
+        show_result(surface)
+      end
+    end
+
+    def test_error
+      Cairo::RecordingSurface.new(0, 0, 100, 100) do |surface|
+        Cairo::Context.new(surface) do |context|
+          called = []
+          raster_source = Cairo::RasterSourcePattern.new(100, 100)
+          raster_source.snapshot do |pattern|
+            called << :snapshot
+            raise NoMemoryError
+          end
+          context.set_source(raster_source)
+          context.rectangle(40, 40, 20, 20)
+          assert_raise(NoMemoryError) do
+            context.fill
+          end
+          assert_equal([:snapshot], called)
+        end
+        show_result(surface)
+      end
+    end
+  end
+
+  class CopyTest < self
+    def test_success
+      output = StringIO.new
+      device = Cairo::ScriptDevice.new(output)
+      Cairo::ScriptSurface.new(device, 100, 200) do |surface|
+        Cairo::Context.new(surface) do |context|
+          called = []
+
+          raster_source = Cairo::RasterSourcePattern.new(100, 100)
+          raster_source.acquire do |pattern, target, extents|
+            called << :acquire
+            red_image = target.create_similar_image(extents.width,
+                                                    extents.height)
+            red_image.set_device_offset(extents.x, extents.y)
+            Cairo::Context.new(red_image) do |red_image_context|
+              red_image_context.set_source(1, 0, 0)
+              red_image_context.paint
+            end
+            red_image
+          end
+          raster_source.release do |pattern, surface|
+            called << :release
+            surface.finish
+          end
+          raster_source.copy do |pattern|
+            called << :copy
+          end
+
+          context.set_source(raster_source)
+          context.rectangle(40, 40, 20, 20)
+          context.fill
+
+          assert_equal([:copy, :acquire, :release], called)
+        end
+        show_result(surface)
+      end
+    end
+
+    def test_error
+      output = StringIO.new
+      device = Cairo::ScriptDevice.new(output)
+      Cairo::ScriptSurface.new(device, 100, 200) do |surface|
+        Cairo::Context.new(surface) do |context|
+          called = []
+
+          raster_source = Cairo::RasterSourcePattern.new(100, 100)
+          raster_source.copy do |pattern|
+            called << :copy
+            raise NoMemoryError
+          end
+
+          context.set_source(raster_source)
+          context.rectangle(40, 40, 20, 20)
+          assert_raise(NoMemoryError) do
+            context.fill
+          end
+
+          assert_equal([:copy], called)
+        end
+        show_result(surface)
+      end
+    end
+  end
+
+  private
+  def show_result(image_surface)
+    return if ENV["RCAIRO_TEST_SHOW_RESULT"] != "yes"
+    result = Tempfile.new("result")
+    image_surface.write_to_png(result.path)
+    system("display", result.path)
+  end
+end

data/test/test_recording_surface.rb

@@ -6,6 +6,7 @@ class RecordingSurfaceTest < Test::Unit::TestCase
   end
 
   def test_new
+    only_cairo_version(1, 12, 0)
     surface = Cairo::RecordingSurface.new(10, 20, 300, 400)
     assert_equal([0.0, 0.0, 0.0, 0.0], surface.ink_extents)
     Cairo::Context.new(surface) do |context|
@@ -13,9 +14,6 @@ class RecordingSurfaceTest < Test::Unit::TestCase
       context.line_to(80, 100)
       context.stroke
     end
-    # 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)
+    assert_equal([10.0, 20.0, 61.0, 61.0], surface.ink_extents)
   end
 end

data/test/test_xml_surface.rb

@@ -6,6 +6,7 @@ class XMLSurfaceTest < Test::Unit::TestCase
   end
 
   def test_new
+    only_cairo_version(1, 12, 0)
     output = StringIO.new
     device = Cairo::XMLDevice.new(output)
     surface = Cairo::XMLSurface.new(device, 100, 200)
@@ -26,7 +27,7 @@ class XMLSurfaceTest < Test::Unit::TestCase
   </source-pattern>
   <path> 15 30 m 80 100 l</path>
   <tolerance>0.1</tolerance>
-  <antialias>ANTIALIAS_DEFAULT</antialias>
+  <antialias>DEFAULT</antialias>
 </stroke>
 EOX
   end

metadata

@@ -1,36 +1,110 @@
 --- !ruby/object:Gem::Specification 
 name: cairo
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 39
   prerelease: 
   segments: 
   - 1
-  - 10
-  - 2
-  version: 1.10.2
+  - 12
+  - 0
+  version: 1.12.0
 platform: x86-mingw32
 authors: 
-- Evan Marin
-- "\xC3\x98yvind Kol\xC3\xA5s"
-- MenTaLguY
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
-dependencies: []
-
+date: 2012-03-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: pkg-config
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: bundler
+  prerelease: false
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit-notify
+  prerelease: false
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake-compiler
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: packnga
+  prerelease: false
+  type: :development
+  requirement: *id005
 description: Ruby bindings for cairo
 email: 
-- cairo@cairographics.org
+- kou@cozmixng.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
+- AUTHORS
+- COPYING
+- GPL
+- Gemfile
+- NEWS
+- README.rdoc
+- ext/cairo/extconf.rb
+- Rakefile
 - lib/cairo/color.rb
 - lib/cairo/papers.rb
 - lib/cairo/point.rb
@@ -57,7 +131,6 @@ files:
 - samples/text-on-path.rb
 - ext/cairo/cairo.def
 - ext/cairo/depend
-- ext/cairo/extconf.rb
 - ext/cairo/rb_cairo_io.c
 - ext/cairo/rb_cairo_constants.c
 - ext/cairo/rb_cairo_pattern.c
@@ -80,13 +153,6 @@ files:
 - ext/cairo/rb_cairo_io.h
 - ext/cairo/rb_cairo.h
 - ext/cairo/rb_cairo_private.h
-- AUTHORS
-- COPYING
-- GPL
-- Gemfile
-- NEWS
-- README.rdoc
-- Rakefile
 - test/test_surface.rb
 - test/test_scaled_font.rb
 - test/test_recording_surface.rb
@@ -98,6 +164,7 @@ files:
 - test/test_context.rb
 - test/cairo-test-utils.rb
 - test/test_xml_device.rb
+- test/test_raster_source_pattern.rb
 - test/run-test.rb
 - test/test_script_surface.rb
 - test/test_region.rb
@@ -720,7 +787,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cairo
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for cairo
@@ -736,6 +803,7 @@ test_files:
 - test/test_context.rb
 - test/cairo-test-utils.rb
 - test/test_xml_device.rb
+- test/test_raster_source_pattern.rb
 - test/run-test.rb
 - test/test_script_surface.rb
 - test/test_region.rb