cairo 1.5.0 → 1.5.1

data/ChangeLog

@@ -1,5 +1,73 @@
+2008-01-11  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/: Cairo::WIN32Surface -> Cairo::Win32Surface.
+
+	* NEWS: added an entry for 1.5.1.
+
+	* extconf.rb: added Quartz backend check for -framework RubyCocoa.
+
+	* src/rb_cairo.h:
+	- RUBY_XXX -> RB_XXX.
+	- added extern "C" {}.
+	- added rb_cCairo_QuartzSurface.
+
+	* src/cairo.def: rb_cCairo_QuartzSurface.
+
+	* src/rb_cairo_surface.c: supported Quartz backend.
+
+2007-12-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_context.c (cr_set_source_surface): fixed wrong type
+	conversion.
+	Reported by Binzo. Thanks!!!
+
+	* README: updated Binzo entry in Thanks list.
+
+2007-12-28  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rb_cairo_context.c (cr_pop_group): fixed a memory leak bug.
+	Reported by Binzo. Thanks!!!
+
+	* README: added Binzo to Thanks list.
+
+2007-06-14  Kouhei Sutou  <kou@cozmixng.org>
+
+	* extconf.rb, src/rb_cairo_surface.c, src/rb_cairo_private.h: used
+	rb_errinfo() and RSTRING_LEN() if available for supporting ruby
+	1.9. Thanks to Paul van Tilburg!!!
+
+	* README: added Paul van Tilburg to Thanks list.
+
+2007-06-14  Paul van Tilburg  <paulvt@debian.org>
+
+	* extconf.rb: used String#each_line instead of String#each for
+	supporting ruby 1.9.
+
+2007-06-03  Kouhei Sutou  <kou@cozmixng.org>
+
+	* samples/agg/aa_test.rb: fixed wrong operation.
+
+2007-05-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/context/path.rb: fixed typos.
+	Thanks to NANKI Haruo!!!
+	* README: added an entry for NANKI Haruo.
+
+2007-05-28  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/lib/cairo/context.rb, src/lib/cairo/context/triangle.rb:
+	added a convenience method.
+
+	* samples/agg/aa_test.rb: implemented random shapes test.
+
 2007-05-27  Kouhei Sutou  <kou@cozmixng.org>
 
+	* samples/agg/aa_test.rb: ported from AGG's example.
+
+        * README: added some links for documentation.
+
+	* src/rb_cairo.c: 1.5.0 -> 1.5.1.
+
 	* Rakefile: improved current release NEWS extraction.
 
 	* NEWS: updated.

data/NEWS

@@ -1,3 +1,17 @@
+Release 1.5.1 (2008-01-11) Kouhei Sutou <kou@cozmixng.org>)
+==========================================================
+
+Features
+--------
+  * Support Quartz surface.
+  * Fix a wrong type conversion bug. (Binzo)
+  * Fix a memory leak bug. (Binzo)
+  * Support ruby 1.9.0. (Paul van Tilburg)
+  * Fix typos. (NANKI Haruo)
+  * Rename Cairo::WIN32Surface to Cairo::Win32Surface
+    * Cairo::WIN32Surface is still available for backward compatibility but
+      don't use in newly written code.
+
 Release 1.5.0 (2007-05-27) Kouhei Sutou <kou@cozmixng.org>)
 ==========================================================
 
@@ -19,7 +33,7 @@ Features
 	To:
 	  context.set_source_color(:red)
 
-    * Support RGB/CMYK/HSV conversion.
+    * Support color type conversion between RGB, CMYK and HSV.
     * Many default color definitions.
   * Support path creation using Cairo::Path without
     Cairo::Context.

data/README

@@ -22,6 +22,18 @@ Compiling
                      # the samples in the samples folder should be able
                      # to run before installation.
 
+Documents
+---------
+
+  * Reference manual:
+      http://cairo.rubyforge.org/doc/
+
+    Repository of the reference manual:
+      http://www.cozmixng.org/repos/rcairo-doc/
+
+  * An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):
+      http://jp.rubyist.net/magazine/?0019-cairo
+
 Mailing list
 ------------
 
@@ -35,3 +47,6 @@ Thanks
 ------
 
   * Yoshinao Muramatsu: win32 surface support patch.
+  * NANKI Haruo: some bug fix patches.
+  * Paul van Tilburg: some patches that support ruby 1.9.
+  * Binzo: some bug reports and fixed that.

data/extconf.rb

@@ -20,26 +20,26 @@ else
   $cc_is_gcc = false
 end
 
-def check_win32()
-  STDOUT.print("checking for Win32 OS... ")
-  STDOUT.flush
-  if /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
-    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
-    STDOUT.print "yes\n"
-    if $cc_is_gcc
-      if /^2\./ =~ `#{Config::CONFIG['CC']} -dumpversion`.chomp
-        $CFLAGS += ' -fnative-struct'
-      else
-        $CFLAGS += ' -mms-bitfields'
+def check_win32
+  checking_for("Win32 OS") do
+    win32_os = /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
+    if win32_os
+      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+      if $cc_is_gcc
+        if /^2\./ =~ `#{Config::CONFIG['CC']} -dumpversion`.chomp
+          $CFLAGS += ' -fnative-struct'
+        else
+          $CFLAGS += ' -mms-bitfields'
+        end
       end
     end
-  else
-    STDOUT.print "no\n"
+    win32_os
   end
 end
 
 def set_output_lib(target_name)
-  if /cygwin|mingw/ =~ RUBY_PLATFORM
+  case RUBY_PLATFORM
+  when /cygwin|mingw/
     filename = "libruby-#{target_name}.a"
     if RUBY_VERSION > "1.8.0"
       $DLDFLAGS << ",--out-implib=#{filename}" if filename
@@ -50,19 +50,18 @@ def set_output_lib(target_name)
       $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
       $DLDFLAGS << " --output-lib #{filename}" if filename
     end
-  elsif /mswin32/ =~ RUBY_PLATFORM
-      filename = "libruby-#{target_name}.lib"
-      $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
-      $DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
-      $DLDFLAGS << " /IMPLIB:#{filename}" if filename
+  when /mswin32/
+    filename = "libruby-#{target_name}.lib"
+    $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
+    $DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
+    $DLDFLAGS << " /IMPLIB:#{filename}" if filename
+  when /darwin/
+    if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])
+      $DLDFLAGS << " -Wl,-framework,RubyCocoa"
+    end
   end
 end
 
-def setup_win32(target_name)
-  check_win32
-  set_output_lib(target_name)
-end
-
 
 pkg = "cairo"
 modname = "cairo"
@@ -72,7 +71,10 @@ major, minor, micro = 1, 2, 0
 
 PKGConfig.have_package(pkg, major, minor, micro) or exit 1
 
-setup_win32(File.basename(modname))
+have_func("rb_errinfo")
+
+check_win32
+set_output_lib(File.basename(modname))
 $defs << "-DRUBY_CAIRO_COMPILATION"
 create_makefile(modname, srcdir)
 
@@ -80,7 +82,7 @@ makefile = File.read("Makefile")
 File.open("Makefile", "w") do |f|
   objs = []
   co = nil
-  makefile.each do |line|
+  makefile.each_line do |line|
     case line
     when /^TARGET\s*=\s*/
       f.print("TARGET = #{ext_dir_name}/#{$POSTMATCH}")

data/samples/agg/README

@@ -0,0 +1,4 @@
+There are many samples ported from Anti-Grain Geometry (AGG:
+http://www.antigrain.com/)
+
+They use Ruby/GTK+ for GUI.

data/samples/agg/aa_demo.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+top = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+src = File.join(top, "src")
+$LOAD_PATH.unshift src
+$LOAD_PATH.unshift File.join(src, "lib")
+
+require 'gtk2'
+
+window = Gtk::Window.new
+window.set_default_size(600, 400)
+
+layout = Gtk::Layout.new
+
+pixel_scale = Gtk::HScale.new(8, 100, (100 - 8) / 23.0)
+pixel_scale.value = 32
+pixel_scale.set_size_request(500, 50)
+layout.put(pixel_scale, 80, 350)
+pixel_label = Gtk::Label.new("Pixel size=")
+layout.put(pixel_label, 80, 370)
+
+gamma_scale = Gtk::HScale.new(0.1, 3.0, 0.001)
+gamma_scale.value = 1.0
+gamma_scale.set_size_request(500, 50)
+layout.put(gamma_scale, 80, 310)
+gamma_label = Gtk::Label.new("Gamma=")
+layout.put(gamma_label, 80, 330)
+
+layout.signal_connect("expose-event") do |widget, event|
+  context = widget.bin_window.create_cairo_context
+  context.move_to(50, 80)
+  context.line_to(200, 250)
+  context.line_to(400, 130)
+  context.close_path
+  context.line_width = 30
+  context.antialias = :none
+  context.set_source_color([0, 150.0/255.0, 160.0/255.0, 200.0/255.0])
+  context.stroke
+  false
+end
+
+window.add(layout)
+
+window.show_all
+
+Gtk.main
+

data/samples/agg/aa_test.rb

@@ -0,0 +1,304 @@
+#!/usr/bin/env ruby
+
+# ported from examples/aa_test.cpp in AGG source tree.
+
+top = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+src = File.join(top, "src")
+$LOAD_PATH.unshift src
+$LOAD_PATH.unshift File.join(src, "lib")
+
+require 'gtk2'
+
+window = Gtk::Window.new
+window.set_default_size(480, 350)
+
+area = Gtk::DrawingArea.new
+
+def stroke_line(context, x1, y1, x2, y2, line_width, dash_length)
+  context.save do
+    yield if block_given?
+    context.move_to(x1, y1)
+    context.line_to(x2, y2)
+    context.set_dash(dash_length) if dash_length > 0
+    context.line_width = line_width
+    context.line_cap = :round
+    context.stroke
+  end
+end
+
+def fill_triangle(context, x1, y1, x2, y2, x3, y3)
+  context.save do
+    yield if block_given?
+    context.triangle(x1, y1, x2, y2, x3, y3)
+    context.fill
+  end
+end
+
+def set_gradient(context, x1, y1, x2, y2, color_stops)
+  pattern = Cairo::LinearPattern.new(x1, y1, x2, y2)
+  color_stops.each do |offset, color|
+    pattern.add_color_stop(offset, color)
+  end
+  context.set_source(pattern)
+end
+
+def stroke_gradient_line(context, x1, y1, x2, y2,
+                         line_width, dash_length, color_stops)
+  stroke_line(context, x1, y1, x2, y2, line_width, dash_length) do
+    set_gradient(context, x1, y1, x2, y2, color_stops)
+  end
+end
+
+def fill_gradient_triangle(context, x1, y1, x2, y2, x3, y3, color_stops)
+  fill_triangle(context, x1, y1, x2, y2, x3, y3) do
+    set_gradient(context,
+                 x1, y1,
+                 x3 - (x3 - x2) / 2.0,
+                 y3 - (y3 - y2) / 2.0,
+                 color_stops)
+  end
+end
+
+def draw_background_circle(context, w, h)
+  context.set_source_color([1.0, 1.0, 1.0, 0.2])
+
+  cx = w / 2.0
+  cy = h / 2.0
+  radius = [cx, cy].min
+  1.upto(180) do |i|
+    n = 2 * Math::PI * i / 180.0
+    stroke_line(context,
+                cx + radius * Math.sin(n),
+                cy + radius * Math.cos(n),
+                cx, cy,
+                1.0, i < 90 ? i : 0)
+  end
+end
+
+def draw_upper_small_circles(context, i)
+  context.circle(18 + i * 4 + 0.5,
+                 33 + 0.5,
+                 i / 20.0)
+  context.fill
+
+  context.circle(18 + i * 4 + (i - 1) / 10.0 + 0.5,
+                 27 + (i - 1) / 10.0 + 0.5,
+                 0.5)
+  context.fill
+end
+
+def draw_upper_circles(context, i)
+  context.set_source_color(:white)
+  context.circle(20 + i * (i + 1) + 0.5,
+                 20.5,
+                 i / 2.0)
+  context.fill
+
+  draw_upper_small_circles(context, i)
+end
+
+def draw_upper_gradient_lines(context, i)
+  stroke_gradient_line(context,
+                       20 + i * (i + 1),
+                       40.5,
+                       20 + i * (i + 1) + (i - 1) * 4,
+                       100.5,
+                       i,
+                       0,
+                       [[0, :white],
+                        [1, [i % 2, (i % 3) * 0.5, (i % 5) * 0.25]]])
+end
+
+def draw_middle_small_circles(context, i)
+  stroke_gradient_line(context,
+                       17.5 + i * 4,
+                       107,
+                       17.5 + i * 4 + i / 6.66666667,
+                       107,
+                       1,
+                       0,
+                       [[0, :red],
+                        [1, :blue]])
+
+  stroke_gradient_line(context,
+                       18 + i * 4,
+                       112.5,
+                       18 + i * 4,
+                       112.5 + i / 6.66666667,
+                       1,
+                       0,
+                       [[0, :red],
+                        [1, :blue]])
+end
+
+def draw_middle_gradient_lines(context, i)
+  stroke_gradient_line(context,
+                       21.5,
+                       120 + (i - 1) * 3.1,
+                       52.5,
+                       120 + (i - 1) * 3.1,
+                       1,
+                       0,
+                       [[0, :red],
+                        [1, :white]])
+
+  stroke_gradient_line(context,
+                       52.5,
+                       118 + i * 3,
+                       83.5,
+                       118 + i * 3,
+                       2 - (i - 1) / 10.0,
+                       0,
+                       [[0, :green],
+                        [1, :white]])
+
+  stroke_gradient_line(context,
+                       83.5,
+                       119 + i * 3,
+                       114.5,
+                       119 + i * 3,
+                       2 - (i - 1) / 10.0,
+                       3.0,
+                       [[0, :blue],
+                        [1, :white]])
+end
+
+def draw_middle_white_lines(context, i)
+  context.set_source_color(:white)
+  stroke_line(context,
+              125.5, 119.5 + (i + 2) * (i / 2.0),
+              135.5, 119.5 + (i + 2) * (i / 2.0),
+              i, 0)
+end
+
+def draw_lower_short_lines(context, i)
+  context.set_source_color(:white)
+
+  stroke_line(context,
+              17.5 + i * 4, 192,
+              18.5 + i * 4, 192,
+              i / 10.0, 0)
+
+  stroke_line(context,
+              17.5 + i * 4 + (i - 1) / 10.0, 186,
+              18.5 + i * 4 + (i - 1) / 10.0, 186,
+              1.0, 0)
+end
+
+def draw_right_triangles(context, i, w, h)
+  x1 = w - 150
+  x2 = w - 20
+  y_upper = h - 20 - i * (i + 2)
+  y_middle = h - 20 - i * (i + 1.5)
+  y_lower = h - 20 - i * (i + 1)
+  context.save do
+    pattern = Cairo::LinearPattern.new(x1, y_middle, x2, y_middle)
+    pattern.add_color_stop(0, :white)
+    pattern.add_color_stop(1, [i % 2, (i % 3) * 0.5, (i % 5) * 0.25])
+    context.set_source(pattern)
+    context.move_to(x1, y_middle)
+    context.line_to(x2, y_lower)
+    context.line_to(x2, y_upper)
+    context.fill
+  end
+end
+
+def draw_sample_shapes(context, w, h)
+  context.set_source_color(:black)
+  context.paint
+
+  draw_background_circle(context, w, h)
+
+  1.upto(20) do |i|
+    draw_upper_circles(context, i)
+    draw_upper_gradient_lines(context, i)
+    draw_middle_small_circles(context, i)
+    draw_middle_gradient_lines(context, i)
+    draw_middle_white_lines(context, i) if i <= 10
+    draw_lower_short_lines(context, i)
+  end
+
+  1.upto(13) do |i|
+    draw_right_triangles(context, i, w, h)
+  end
+end
+
+def draw_random_shapes(context, w, h)
+  srand(123)
+
+  context.set_source_color(:black)
+  context.paint
+
+  n_circles = 20000
+  start = Time.now
+  n_circles.times do |i|
+    context.circle(rand(w), rand(h), rand(20.0) + 1.0)
+    context.set_source_color([rand, rand, rand, 0.5 + rand / 2])
+    context.fill
+  end
+  circle_draw_time = Time.now - start
+
+  n_lines = 2000
+  start = Time.now
+  n_lines.times do |i|
+    x1 = rand(w)
+    y1 = rand(h)
+    stroke_gradient_line(context,
+                         x1, y1,
+                         x1 + rand(w * 0.5) - w * 0.25,
+                         y1 + rand(h * 0.5) - h * 0.25,
+                         10.0, 0,
+                         [[0, [rand, rand, rand, 0.5 + rand / 2]],
+                          [1, [rand, rand, rand, rand]]])
+  end
+  line_draw_time = Time.now - start
+
+  n_triangles = 2000
+  start = Time.now
+  n_triangles.times do |i|
+    x1 = rand(w)
+    y1 = rand(h)
+    fill_gradient_triangle(context,
+                           x1, y1,
+                           x1 + rand(w * 0.4) - w * 0.2,
+                           y1 + rand(h * 0.4) - h * 0.2,
+                           x1 + rand(w * 0.4) - w * 0.2,
+                           y1 + rand(h * 0.4) - h * 0.2,
+                           [[0, [rand, rand, rand, 0.5 + rand / 2]],
+                            [0.5, [rand, rand, rand, rand]],
+                            [1, [rand, rand, rand, rand]]])
+  end
+  triangle_draw_time = Time.now - start
+
+  puts "Points=%.2fK/sec, Lines=%.2fK/sec, Triangles=%.2fK/sec" %
+    [n_circles.to_f / circle_draw_time,
+     n_lines.to_f / line_draw_time,
+     n_triangles.to_f / triangle_draw_time]
+end
+
+random_mode = false
+
+area.add_events(Gdk::Event::BUTTON_PRESS_MASK)
+area.signal_connect("button-press-event") do |widget, event|
+  random_mode = !random_mode
+  widget.queue_draw
+  false
+end
+
+area.signal_connect("expose-event") do |widget, event|
+  context = widget.window.create_cairo_context
+  x, y, w, h = widget.allocation.to_a
+  if random_mode
+    draw_random_shapes(context, w, h)
+  else
+    draw_sample_shapes(context, w, h)
+  end
+  true
+end
+
+window.add(area)
+
+window.show_all
+
+Gtk.main
+

data/src/cairo.def

@@ -26,7 +26,8 @@ EXPORTS
     rb_cCairo_PDFSurface      DATA
     rb_cCairo_PSSurface       DATA
     rb_cCairo_SVGSurface      DATA
-    rb_cCairo_WIN32Surface    DATA
+    rb_cCairo_Win32Surface    DATA
+    rb_cCairo_QuartzSurface   DATA
 
     rb_mCairo_Operator        DATA
     rb_mCairo_Antialias       DATA

data/src/lib/cairo.rb

@@ -93,3 +93,9 @@ require 'cairo/point'
 require 'cairo/colors'
 require 'cairo/context'
 require 'cairo/path'
+
+module Cairo
+  if const_defined?(:Win32Surface)
+    WIN32Surface = Win32Surface # For backward compatibility
+  end
+end

data/src/lib/cairo/context.rb

@@ -1,4 +1,5 @@
 require 'cairo/context/rectangle'
+require 'cairo/context/triangle'
 require 'cairo/context/circle'
 require 'cairo/context/path'
 require 'cairo/context/blur'
@@ -7,6 +8,7 @@ require 'cairo/context/color'
 module Cairo
   class Context
     include Rectangle
+    include Triangle
     include Circle
     include Path
     include Blur

data/src/lib/cairo/context/path.rb

@@ -79,7 +79,7 @@ module Cairo
                   3 * cy1       * (    2 * ratio - 3 * ratio * ratio) +
                   3 * cy2       *      ratio  * ratio
 
-            ratio = y / Math.sqrt(dx ** 2, dy ** 2)
+            ratio = y / Math.sqrt(dx ** 2 + dy ** 2)
 
             [new_x + -dy * ratio, new_y + dx * ratio]
           when PATH_CLOSE_PATH

data/src/lib/cairo/context/triangle.rb

@@ -0,0 +1,12 @@
+module Cairo
+  class Context
+    module Triangle
+      def triangle(x1, y1, x2, y2, x3, y3)
+        move_to(x1, y1)
+        line_to(x2, y2)
+        line_to(x3, y3)
+        close_path
+      end
+    end
+  end
+end

data/src/rb_cairo.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/23 02:26:24 $
+ * $Date: 2007/05/27 02:46:01 $
  *
  * Copyright 2006-2007 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
@@ -58,7 +58,7 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (5), INT2FIX (0), Qnil));
+                                INT2FIX (1), INT2FIX (5), INT2FIX (1), Qnil));
 
   rb_mCairo_Color = rb_const_get (rb_mCairo, rb_intern ("Color"));
   rb_cCairo_Color_Base = rb_const_get (rb_mCairo_Color, rb_intern ("Base"));

data/src/rb_cairo.h

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/22 11:25:39 $
+ * $Date: 2008-01-11 12:18:34 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -36,6 +36,10 @@
 #  undef OpenFile
 #endif
 
+#if CAIRO_HAS_QUARTZ_SURFACE
+#  include <cairo-quartz.h>
+#endif
+
 #define CAIRO_CHECK_VERSION(major, minor, micro)    \
     (CAIRO_VERSION_MAJOR > (major) || \
      (CAIRO_VERSION_MAJOR == (major) && CAIRO_VERSION_MINOR > (minor)) || \
@@ -44,67 +48,87 @@
 
 #include "ruby.h"
 
-#if defined(RUBY_CAIRO_PLATFORM_WIN32) && !defined(RUBY_CAIRO_STATIC_COMPILATION)
-#  ifdef RUBY_CAIRO_COMPILATION
-#    define RUBY_CAIRO_VAR __declspec(dllexport)
+#if defined(__cplusplus)
+#  define RB_CAIRO_BEGIN_DECLS extern "C" {
+#  define RB_CAIRO_END_DECLS }
+#else
+#  define RB_CAIRO_BEGIN_DECLS
+#  define RB_CAIRO_END_DECLS
+#endif
+
+RB_CAIRO_BEGIN_DECLS
+
+#if defined(RUBY_CAIRO_PLATFORM_WIN32) && !defined(RB_CAIRO_PLATFORM_WIN32)
+#  define RB_CAIRO_PLATFORM_WIN32 RUBY_CAIRO_PLATFORM_WIN32
+#endif
+
+#if defined(RUBY_CAIRO_STATIC_COMPILATION) && !defined(RB_CAIRO_STATIC_COMPILATION)
+#  define RB_CAIRO_STATIC_COMPILATION RUBY_CAIRO_STATIC_COMPILATION
+#endif
+
+#if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(RB_CAIRO_STATIC_COMPILATION)
+#  ifdef RB_CAIRO_COMPILATION
+#    define RB_CAIRO_VAR __declspec(dllexport)
 #  else
-#    define RUBY_CAIRO_VAR extern __declspec(dllimport)
+#    define RB_CAIRO_VAR extern __declspec(dllimport)
 #  endif
 #else
-#  define RUBY_CAIRO_VAR extern
+#  define RB_CAIRO_VAR extern
 #endif
 
-RUBY_CAIRO_VAR VALUE rb_mCairo;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Context;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Point;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Path;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PathData;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PathMoveTo;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PathLineTo;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PathCurveTo;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PathClosePath;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Matrix;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Pattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_SolidPattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_SurfacePattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_GradientPattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_LinearPattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_RadialPattern;
-RUBY_CAIRO_VAR VALUE rb_cCairo_FontFace;
-RUBY_CAIRO_VAR VALUE rb_cCairo_FontExtents;
-RUBY_CAIRO_VAR VALUE rb_cCairo_FontOptions;
-RUBY_CAIRO_VAR VALUE rb_cCairo_ScaledFont;
-RUBY_CAIRO_VAR VALUE rb_cCairo_TextExtents;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Glyph;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Surface;
-RUBY_CAIRO_VAR VALUE rb_cCairo_ImageSurface;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PDFSurface;
-RUBY_CAIRO_VAR VALUE rb_cCairo_PSSurface;
-RUBY_CAIRO_VAR VALUE rb_cCairo_SVGSurface;
-RUBY_CAIRO_VAR VALUE rb_cCairo_WIN32Surface;
-
-RUBY_CAIRO_VAR VALUE rb_mCairo_Operator;
-RUBY_CAIRO_VAR VALUE rb_mCairo_Antialias;
-RUBY_CAIRO_VAR VALUE rb_mCairo_FillRule;
-RUBY_CAIRO_VAR VALUE rb_mCairo_LineCap;
-RUBY_CAIRO_VAR VALUE rb_mCairo_LineJoin;
-RUBY_CAIRO_VAR VALUE rb_mCairo_FontSlant;
-RUBY_CAIRO_VAR VALUE rb_mCairo_FontWeight;
-RUBY_CAIRO_VAR VALUE rb_mCairo_SubpixelOrder;
-RUBY_CAIRO_VAR VALUE rb_mCairo_HintStyle;
-RUBY_CAIRO_VAR VALUE rb_mCairo_HintMetrics;
-RUBY_CAIRO_VAR VALUE rb_mCairo_FontType;
-RUBY_CAIRO_VAR VALUE rb_mCairo_PathDataType;
-RUBY_CAIRO_VAR VALUE rb_mCairo_Content;
-RUBY_CAIRO_VAR VALUE rb_mCairo_SurfaceType;
-RUBY_CAIRO_VAR VALUE rb_mCairo_Format;
-RUBY_CAIRO_VAR VALUE rb_mCairo_PatternType;
-RUBY_CAIRO_VAR VALUE rb_mCairo_Extend;
-RUBY_CAIRO_VAR VALUE rb_mCairo_Filter;
-RUBY_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
-
-RUBY_CAIRO_VAR VALUE rb_mCairo_Color;
-RUBY_CAIRO_VAR VALUE rb_cCairo_Color_Base;
+RB_CAIRO_VAR VALUE rb_mCairo;
+RB_CAIRO_VAR VALUE rb_cCairo_Context;
+RB_CAIRO_VAR VALUE rb_cCairo_Point;
+RB_CAIRO_VAR VALUE rb_cCairo_Path;
+RB_CAIRO_VAR VALUE rb_cCairo_PathData;
+RB_CAIRO_VAR VALUE rb_cCairo_PathMoveTo;
+RB_CAIRO_VAR VALUE rb_cCairo_PathLineTo;
+RB_CAIRO_VAR VALUE rb_cCairo_PathCurveTo;
+RB_CAIRO_VAR VALUE rb_cCairo_PathClosePath;
+RB_CAIRO_VAR VALUE rb_cCairo_Matrix;
+RB_CAIRO_VAR VALUE rb_cCairo_Pattern;
+RB_CAIRO_VAR VALUE rb_cCairo_SolidPattern;
+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_FontFace;
+RB_CAIRO_VAR VALUE rb_cCairo_FontExtents;
+RB_CAIRO_VAR VALUE rb_cCairo_FontOptions;
+RB_CAIRO_VAR VALUE rb_cCairo_ScaledFont;
+RB_CAIRO_VAR VALUE rb_cCairo_TextExtents;
+RB_CAIRO_VAR VALUE rb_cCairo_Glyph;
+RB_CAIRO_VAR VALUE rb_cCairo_Surface;
+RB_CAIRO_VAR VALUE rb_cCairo_ImageSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_PDFSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_PSSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_SVGSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_Win32Surface;
+/* For backward compatibility*/
+#define rb_cCairo_WIN32Surface rb_cCairo_Win32Surface
+RB_CAIRO_VAR VALUE rb_cCairo_QuartzSurface;
+
+RB_CAIRO_VAR VALUE rb_mCairo_Operator;
+RB_CAIRO_VAR VALUE rb_mCairo_Antialias;
+RB_CAIRO_VAR VALUE rb_mCairo_FillRule;
+RB_CAIRO_VAR VALUE rb_mCairo_LineCap;
+RB_CAIRO_VAR VALUE rb_mCairo_LineJoin;
+RB_CAIRO_VAR VALUE rb_mCairo_FontSlant;
+RB_CAIRO_VAR VALUE rb_mCairo_FontWeight;
+RB_CAIRO_VAR VALUE rb_mCairo_SubpixelOrder;
+RB_CAIRO_VAR VALUE rb_mCairo_HintStyle;
+RB_CAIRO_VAR VALUE rb_mCairo_HintMetrics;
+RB_CAIRO_VAR VALUE rb_mCairo_FontType;
+RB_CAIRO_VAR VALUE rb_mCairo_PathDataType;
+RB_CAIRO_VAR VALUE rb_mCairo_Content;
+RB_CAIRO_VAR VALUE rb_mCairo_SurfaceType;
+RB_CAIRO_VAR VALUE rb_mCairo_Format;
+RB_CAIRO_VAR VALUE rb_mCairo_PatternType;
+RB_CAIRO_VAR VALUE rb_mCairo_Extend;
+RB_CAIRO_VAR VALUE rb_mCairo_Filter;
+RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
+RB_CAIRO_VAR VALUE rb_mCairo_Color;
+RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 
 
 #define RVAL2CRCONTEXT(obj)     (rb_cairo_context_from_ruby_object(obj))
@@ -218,4 +242,6 @@ void rb_cairo_check_status (cairo_status_t status);
 #define RB_CAIRO_DEF_SETTERS(klass) rb_cairo_def_setters(klass);
 void rb_cairo_def_setters (VALUE klass);
 
+RB_CAIRO_END_DECLS
+
 #endif

data/src/rb_cairo_context.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/20 08:46:07 $
+ * $Date: 2007-12-29 11:42:26 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -125,11 +125,14 @@ cr_save (VALUE self)
 static VALUE
 cr_pop_group (VALUE self)
 {
+  VALUE rb_pattern;
   cairo_pattern_t *pattern;
 
   pattern = cairo_pop_group (_SELF);
   cr_check_status (_SELF);
-  return CRPATTERN2RVAL (pattern);
+  rb_pattern = CRPATTERN2RVAL (pattern);
+  cairo_pattern_destroy (pattern);
+  return rb_pattern;
 }
 
 static VALUE
@@ -287,8 +290,8 @@ cr_set_source_surface (VALUE self, VALUE surface, VALUE width, VALUE height)
 {
   cairo_set_source_surface (_SELF,
                             RVAL2CRSURFACE (surface),
-                            NUM2INT (width),
-                            NUM2INT (height));
+                            NUM2DBL (width),
+                            NUM2DBL (height));
   cr_check_status (_SELF);
   rb_ivar_set (self, cr_id_source, Qnil);
   return self;

data/src/rb_cairo_private.h

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/18 14:07:48 $
+ * $Date: 2008-01-11 08:03:39 $
  *
  * Copyright 2005 Kouhei Sutou <kou@cozmixng.org>
  *
@@ -23,6 +23,16 @@
 #define CBOOL2RVAL(bool) (bool ? Qtrue : Qfalse)
 #define RVAL2CBOOL(bool) RTEST(bool)
 
+#ifndef RSTRING_LEN
+#  define RSTRING_LEN(string) (RSTRING(string)->len)
+#endif
+
+#ifdef HAVE_RB_ERRINFO
+#  define RB_ERRINFO (rb_errinfo())
+#else
+#  define RB_ERRINFO (ruby_errinfo)
+#endif
+
 extern void Init_cairo_private (void);
 extern void Init_cairo_constants (void);
 
@@ -30,6 +40,7 @@ extern void Init_cairo_context (void);
 extern void Init_cairo_path (void);
 extern void Init_cairo_matrix (void);
 extern void Init_cairo_surface (void);
+extern void Init_cairo_quartz_surface (void);
 extern void Init_cairo_exception (void);
 extern void Init_cairo_font (void);
 extern void Init_cairo_font_extents (void);

data/src/rb_cairo_surface.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/20 23:31:57 $
+ * $Date: 2008-01-11 12:19:44 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -26,10 +26,11 @@
 
 VALUE rb_cCairo_Surface;
 VALUE rb_cCairo_ImageSurface;
-VALUE rb_cCairo_PDFSurface;
-VALUE rb_cCairo_PSSurface;
-VALUE rb_cCairo_SVGSurface;
-VALUE rb_cCairo_WIN32Surface;
+VALUE rb_cCairo_PDFSurface = Qnil;
+VALUE rb_cCairo_PSSurface = Qnil;
+VALUE rb_cCairo_SVGSurface = Qnil;
+VALUE rb_cCairo_Win32Surface = Qnil;
+VALUE rb_cCairo_QuartzSurface = Qnil;
 
 static ID cr_id_target;
 static ID cr_id_read;
@@ -66,7 +67,7 @@ cr_surface_get_klass (cairo_surface_t *surface)
       klass = rb_cCairo_SVGSurface;
       break;
     case CAIRO_SURFACE_TYPE_WIN32:
-      klass = rb_cCairo_WIN32Surface;
+      klass = rb_cCairo_Win32Surface;
       break;
     default:
       rb_raise (rb_eArgError, "unknown source type: %d", type);
@@ -115,7 +116,7 @@ cr_surface_io_func_rescue (VALUE io_closure)
 {
   cr_io_callback_closure_t *closure;
   closure = (cr_io_callback_closure_t *)io_closure;
-  closure->error = ruby_errinfo;
+  closure->error = RB_ERRINFO;
   return Qnil;
 }
 
@@ -133,13 +134,13 @@ cr_surface_write_func_invoke (VALUE write_closure)
   output = closure->target;
   data = rb_str_new ((const char *)closure->data, closure->length);
 
-  length = RSTRING (data)->len;
+  length = RSTRING_LEN (data);
   while (length != 0)
     {
       VALUE rb_written_bytes = rb_funcall (output, cr_id_write, 1, data);
       written_bytes = NUM2LONG (rb_written_bytes);
       data = rb_str_substr (data, written_bytes,
-                            RSTRING (data)->len - written_bytes);
+                            RSTRING_LEN (data) - written_bytes);
       length -= written_bytes;
     }
   
@@ -180,7 +181,7 @@ cr_surface_read_func_invoke (VALUE read_closure)
   
   result = rb_str_new2 ("");
 
-  for (rest = length; rest != 0; rest = length - RSTRING (result)->len)
+  for (rest = length; rest != 0; rest = length - RSTRING_LEN (result))
     {
       rb_str_concat (result, rb_funcall (input, cr_id_read, 1, INT2NUM (rest)));
     }
@@ -830,6 +831,75 @@ cr_win32_surface_get_image (VALUE self)
 }
 #endif
 
+#if CAIRO_HAS_QUARTZ_SURFACE
+/* Quartz-surface functions */
+
+#include <objc/objc-runtime.h>
+
+VALUE ocobj_s_new (id ocid);
+id rbobj_get_ocid (VALUE obj);
+
+
+static VALUE
+cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  id objc_object = nil;
+  CGContextRef context;
+  unsigned int width, height;
+  cairo_surface_t *surface = NULL;
+  cairo_format_t format = CAIRO_FORMAT_ARGB32;
+  VALUE arg1, arg2, arg3, rb_width, rb_height;
+
+  rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
+
+  if (argc == 2)
+    {
+      rb_width = arg1;
+      rb_height = arg2;
+    }
+  else
+    {
+      objc_object = rbobj_get_ocid (arg1);
+      if (objc_object == nil)
+        format = RVAL2CRFORMAT (arg1);
+
+      rb_width = arg2;
+      rb_height = arg3;
+    }
+
+  width = NUM2UINT (rb_width);
+  height = NUM2UINT (rb_height);
+
+  if (objc_object == nil)
+    {
+      surface = cairo_quartz_surface_create (format, width, height);
+    }
+  else
+    {
+      context = (CGContextRef)objc_object;
+      surface =
+        cairo_quartz_surface_create_for_cg_context (context, width, height);
+    }
+
+  cr_surface_check_status (surface);
+  DATA_PTR (self) = surface;
+  if (rb_block_given_p ())
+    yield_and_finish (self);
+  return Qnil;
+}
+
+static VALUE
+cr_quartz_surface_get_cg_context (VALUE self)
+{
+  CGContextRef context;
+  id objc_object;
+
+  context = cairo_quartz_surface_get_cg_context (_SELF);
+  objc_object = (id)context;
+  return ocobj_s_new (objc_object);
+}
+#endif
+
 
 void
 Init_cairo_surface (void)
@@ -909,8 +979,6 @@ Init_cairo_surface (void)
                     cr_ps_surface_dsc_begin_page_setup, 0);
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PSSurface);
-#else
-  rb_cCairo_PSSurface = Qnil;
 #endif
 
 #if CAIRO_HAS_PDF_SURFACE
@@ -921,8 +989,6 @@ Init_cairo_surface (void)
                     cr_pdf_surface_set_size, 2);
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
-#else
-  rb_cCairo_PDFSurface = Qnil;
 #endif
 
 #if CAIRO_HAS_SVG_SURFACE
@@ -938,22 +1004,30 @@ Init_cairo_surface (void)
                     cr_svg_surface_restrict_to_version, 1);
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_SVGSurface);
-#else
-  rb_cCairo_SVGSurface = Qnil;
 #endif
 
 #if CAIRO_HAS_WIN32_SURFACE
-  /* WIN32-surface */
-  rb_cCairo_WIN32Surface =
-    rb_define_class_under (rb_mCairo, "WIN32Surface", rb_cCairo_Surface);
+  /* Win32-surface */
+  rb_cCairo_Win32Surface =
+    rb_define_class_under (rb_mCairo, "Win32Surface", rb_cCairo_Surface);
 
-  rb_define_method (rb_cCairo_WIN32Surface, "initialize",
+  rb_define_method (rb_cCairo_Win32Surface, "initialize",
                     cr_win32_surface_initialize, -1);
-  rb_define_method (rb_cCairo_WIN32Surface, "hdc",
+  rb_define_method (rb_cCairo_Win32Surface, "hdc",
                     cr_win32_surface_get_hdc, 0);
-  rb_define_method (rb_cCairo_WIN32Surface, "image",
+  rb_define_method (rb_cCairo_Win32Surface, "image",
                     cr_win32_surface_get_image, 0);
-#else
-  rb_cCairo_WIN32Surface = Qnil;
+#endif
+
+#if CAIRO_HAS_QUARTZ_SURFACE
+  /* Quartz-surface */
+
+  rb_cCairo_QuartzSurface =
+    rb_define_class_under (rb_mCairo, "QuartzSurface", rb_cCairo_Surface);
+
+  rb_define_method (rb_cCairo_QuartzSurface, "initialize",
+                    cr_quartz_surface_initialize, -1);
+  rb_define_method (rb_cCairo_QuartzSurface, "cg_context",
+                    cr_quartz_surface_get_cg_context, 0);
 #endif
 }

metadata

@@ -1,38 +1,30 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: cairo
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
-date: 2007-05-27 00:00:00 +09:00
-summary: Ruby bindings for cairo
-require_paths: 
-- src/lib
-- src
-email: 
-- cairo@cairographics.org
-homepage: http://cairographics.org/rcairo
-rubyforge_project: cairo
-description: Ruby bindings for cairo
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.5.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Evan Marin
 - "\xC3\x98yvind Kol\xC3\xA5s"
 - MenTaLguY
 - Kouhei Sutou
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-11 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: Ruby bindings for cairo
+email: 
+- cairo@cairographics.org
+executables: []
+
+extensions: 
+- extconf.rb
+extra_rdoc_files: []
+
 files: 
 - AUTHORS
 - COPYING
@@ -45,6 +37,9 @@ files:
 - misc/update-colors.rb
 - pkg-config.rb
 - samples/.#blur.rb.1.1
+- samples/agg/README
+- samples/agg/aa_demo.rb
+- samples/agg/aa_test.rb
 - samples/blur.rb
 - samples/pac.rb
 - samples/pac2.rb
@@ -63,6 +58,7 @@ files:
 - src/lib/cairo/context/color.rb
 - src/lib/cairo/context/path.rb
 - src/lib/cairo/context/rectangle.rb
+- src/lib/cairo/context/triangle.rb
 - src/lib/cairo/path.rb
 - src/lib/cairo/point.rb
 - src/rb_cairo.c
@@ -82,18 +78,33 @@ files:
 - src/rb_cairo_scaled_font.c
 - src/rb_cairo_surface.c
 - src/rb_cairo_text_extents.c
-test_files: []
-
+has_rdoc: false
+homepage: http://cairographics.org/rcairo
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: []
-
-executables: []
-
-extensions: 
-- extconf.rb
+require_paths: 
+- src/lib
+- src
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: cairo
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Ruby bindings for cairo
+test_files: []