[cairo-commit] rcairo/src/lib cairo.rb,1.9,1.10

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo/src/lib
In directory kemper:/tmp/cvs-serv7585/src/lib

Modified Files:
	cairo.rb 
Log Message:
* src/rb_cairo_font_options.c (Cairo::FontOptions#merge): renamed
  to merge! because the method is destructive.

* src/lib/cairo.rb (Cairo::FontOptions#merge): added
  non-destructive version.


Index: cairo.rb
===================================================================
RCS file: /cvs/cairo/rcairo/src/lib/cairo.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairo.rb	23 May 2007 13:02:41 -0000	1.9
+++ cairo.rb	26 May 2007 15:13:25 -0000	1.10
@@ -81,6 +81,12 @@
     def multiply(other); dup.multiply!(other); end
     alias * multiply
   end
+
+  class FontOptions
+    def merge(other)
+      dup.merge!(other)
+    end
+  end
 end
 
 require 'cairo/point'