rmagick 1.8.3 → 1.9.0

data/doc/ex/cubic02.rb

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
 Border       = { :fill=>'none', :stroke=>'blue', :stroke_width=>1 }
 Connect      = { :fill=>'none', :stroke=>'#888888', :stroke_width=>2 }
@@ -11,7 +10,7 @@ CtlPoint     = { :fill=>'#888888', :stroke=>'none' }
 AutoCtlPoint = { :fill=>'none', :stroke=>'blue', :stroke_width=>4 }
 Label        = { :text_anchor=>'middle', :font_size=>22, :font_family=>'Verdana' }
 
-rvg = RVG.new(10.cm, 10.cm).viewbox(0, 0, 1000, 1000) do |canvas|
+rvg = Magick::RVG.new(10.cm, 10.cm).viewbox(0, 0, 1000, 1000) do |canvas|
     canvas.title = 'Example cubic02 - cubic Bezier commands in path data'
     canvas.desc = <<-END_DESC
         Picture showing examples of "C" and "S" commands,

data/doc/ex/ellipse01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example ellipse01 - examples of ellipses"
 

data/doc/ex/evenodd.rb

@@ -1,16 +1,15 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example fillrule - nonzero - demonstrates fill_rule=>'nonzero'"
 
     canvas.rect(1195, 393, 1, 1).styles(:fill=>'none', :stroke=>'blue')
 
-    triangle = RVG::Group.new do |defs|
+    triangle = Magick::RVG::Group.new do |defs|
         defs.path("M 16,0 L -8,9 v-18 z").styles(:fill=>'black', :stroke=>'none')
     end
 

data/doc/ex/font_styles.rb

@@ -1,9 +1,8 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
 
-rvg = RVG.new(200, 250) do |canvas|
+rvg = Magick::RVG.new(200, 250) do |canvas|
     canvas.background_fill = 'white'
 
     canvas.g do |grp|

data/doc/ex/group.rb

@@ -1,14 +1,13 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(6.cm, 4.cm).viewbox(0,0,600,400) do |canvas|
+rvg = Magick::RVG.new(6.cm, 4.cm).viewbox(0,0,600,400) do |canvas|
     canvas.background_fill = 'white'
     canvas.rect(595,395,1,1).styles(:stroke=>'blue', :fill=>'none', :stroke_width=>2)
 
     # Define a stick figure.
-    stick = RVG::Group.new.styles(:stroke=>'black', :fill=>'none', :stroke_width=>6) do |fig|
+    stick = Magick::RVG::Group.new.styles(:stroke=>'black', :fill=>'none', :stroke_width=>6) do |fig|
         fig.circle(42, 50, 50).styles(:stroke=>'red')
         fig.polyline(30,40, 50,40, 45,60, 50,40, 65,40).styles(:stroke_width=>4)
         fig.polyline(10,100, 50,130, 90,100)

data/doc/ex/image.rb

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
 
-rvg = RVG.new(525, 270) do |canvas|
+rvg = Magick::RVG.new(525, 270) do |canvas|
     canvas.background_fill = 'white'
     canvas.rect(524, 269).styles(:fill=>'none', :stroke=>'blue', :stroke_width=>1)
 

data/doc/ex/line01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example line01 - lines expressed in user coordinates"
 

data/doc/ex/nested_rvg.rb

@@ -1,9 +1,8 @@
 #! /usr/local/bin/ruby -w
 
 require 'rvg/rvg'
-include Magick
 
-target = RVG.new.viewbox(0,0,200,200) do |targ|
+target = Magick::RVG.new.viewbox(0,0,200,200) do |targ|
     targ.g.styles(:stroke_width=>20, :stroke=>'#ff5600', :fill=>'#abd600') do |grp|
         grp.circle(90, 100, 100)
         grp.circle(60, 100, 100)
@@ -11,7 +10,7 @@ target = RVG.new.viewbox(0,0,200,200) do |targ|
     end
 end
 
-rvg = RVG.new(258, 100) do |canvas|
+rvg = Magick::RVG.new(258, 100) do |canvas|
     canvas.background_fill = '#51396b'
     canvas.use(target, 0, 0, 100, 100)
     canvas.use(target, 100, 16.6667, 66.7, 66.7)

data/doc/ex/nonzero.rb

@@ -1,16 +1,15 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example fillrule - nonzero - demonstrates fill_rule=>'nonzero'"
 
     canvas.rect(1195, 393, 1, 1).styles(:fill=>'none', :stroke=>'blue')
 
-    triangle = RVG::Group.new do |defs|
+    triangle = Magick::RVG::Group.new do |defs|
         defs.path("M 16,0 L -8,9 v-18 z").styles(:fill=>'black', :stroke=>'none')
     end
 

data/doc/ex/polygon01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example polygon01 - star and hexagon"
 

data/doc/ex/polyline01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm).viewbox(0, 0, 1200, 400) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example polyline01 - increasingly larger bars"
 

data/doc/ex/quad01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 6.cm).viewbox(0, 0, 1200, 600) do |canvas|
+rvg = Magick::RVG.new(12.cm, 6.cm).viewbox(0, 0, 1200, 600) do |canvas|
     canvas.title = "Example quad01 - quadratic Bezier commands in path data"
     canvas.desc = <<-END_DESC
         Picture showing a "Q" a "T" command, along with annotations showing the

data/doc/ex/rect01.rb

@@ -1,8 +1,7 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
-rvg = RVG.new(12.cm, 4.cm) do |canvas|
+Magick::RVG.dpi = 90
+rvg = Magick::RVG.new(12.cm, 4.cm) do |canvas|
     canvas.viewbox(0, 0, 1200, 400)
     canvas.background_fill = 'white'
     canvas.desc = "Example rect01 - rectangle with sharp corners"

data/doc/ex/rect02.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(12.cm, 4.cm) do |canvas|
+rvg = Magick::RVG.new(12.cm, 4.cm) do |canvas|
     canvas.viewbox(0, 0, 1200, 400)
     canvas.background_fill = 'white'
     canvas.desc = "Example rect02 - rounded rectangles"

data/doc/ex/rvg_clippath.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-hat = Image.read('images/Flower_Hat.jpg').first
-rvg = RVG.new(hat.columns, hat.rows) do |canvas|
-    keyhole = RVG::ClipPath.new do |path|
+hat = Magick::Image.read('images/Flower_Hat.jpg').first
+rvg = Magick::RVG.new(hat.columns, hat.rows) do |canvas|
+    keyhole = Magick::RVG::ClipPath.new do |path|
         path.circle(60, canvas.width/2, 80)
         path.polygon(canvas.width/2-10, 60, 40, 230, 160, 230, canvas.width/2+10, 60)
     end

data/doc/ex/rvg_linecap.rb

@@ -1,8 +1,7 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
 BUTT   = {:stroke=>'black', :stroke_width=>70, :stroke_linecap=>'butt'}
 ROUND  = {:stroke=>'black', :stroke_width=>70, :stroke_linecap=>'round'}
@@ -11,7 +10,7 @@ THIN   = {:stroke=>'#ffcccc', :stroke_width=>5}
 TEXT   = {:text_anchor=>'middle', :font_size=>50, :font_family=>'Verdana'}
 CIRCLE = {:fill=>'#ffcccc', :stroke=>'none'}
 
-rvg = RVG.new(12.cm, 2.cm).viewbox(0, 0, 1200, 200) do |canvas|
+rvg = Magick::RVG.new(12.cm, 2.cm).viewbox(0, 0, 1200, 200) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example linecap - demonstrates three stroke-linecap values"
 

data/doc/ex/rvg_linejoin.rb

@@ -1,7 +1,6 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
 MITER = {:stroke=>'black', :stroke_width=>70, :fill=>'none', :stroke_linejoin=>'miter'}
 ROUND = {:stroke=>'black', :stroke_width=>70, :fill=>'none', :stroke_linejoin=>'round'}
@@ -10,7 +9,7 @@ THIN  = {:stroke=>'#ffcccc', :stroke_width=>5, :fill=>'none'}
 TEXT   = {:text_anchor=>'middle', :font_size=>50, :font_family=>'Verdana'}
 CIRCLE = {:fill=>'#ffcccc', :stroke=>'none'}
 
-rvg = RVG.new(12.cm, 3.5.cm).viewbox(0, 0, 1200, 350) do |canvas|
+rvg = Magick::RVG.new(12.cm, 3.5.cm).viewbox(0, 0, 1200, 350) do |canvas|
     canvas.desc = 'Example linecap - demonstrates three stroke-linecap values'
     canvas.background_fill = 'white'
 

data/doc/ex/rvg_opacity.rb

@@ -1,10 +1,9 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
 FONT_STYLES = {:font_size=>20, :font_weight=>'bold', :fill=>'white'}
 
-rvg = RVG.new(450, 150) do |canvas|
+rvg = Magick::RVG.new(450, 150) do |canvas|
     canvas.background_fill = 'white'
     canvas.rect(400, 50, 25, 50)
     canvas.circle(40, 100, 75).styles(:opacity=>0.25, :stroke=>'blue', :fill=>'#00ff00',:stroke_width=>8)

data/doc/ex/rvg_pattern.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-rvg = RVG.new(300, 300) do |canvas|
+rvg = Magick::RVG.new(300, 300) do |canvas|
     canvas.background_fill = 'white'
-    triangles = RVG::Pattern.new(16, 16).viewbox(0,0, 50,50) do |pat|
+    triangles = Magick::RVG::Pattern.new(16, 16).viewbox(0,0, 50,50) do |pat|
         pat.rect(50, 50).styles(:fill=>'darkblue')
         pat.polygon(0,0, 25,50, 50,0, 0,0).styles(:fill=>'yellow', :stroke=>'red')
     end
@@ -12,7 +11,7 @@ rvg = RVG.new(300, 300) do |canvas|
 
     hat = Magick::Image.read('images/Flower_Hat.jpg').first
 
-    hats = RVG::Pattern.new(hat.columns/4.0, hat.rows/4.0) do |pat|
+    hats = Magick::RVG::Pattern.new(hat.columns/4.0, hat.rows/4.0) do |pat|
         pat.image(hat, hat.columns/4.0, hat.rows/4.0)
     end
 

data/doc/ex/rvg_stroke_dasharray.rb

@@ -1,8 +1,7 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
-rvg = RVG.new(200, 100) do |canvas|
+rvg = Magick::RVG.new(200, 100) do |canvas|
             canvas.background_fill = 'white'
             canvas.rect(150, 50, 25, 25).round(6).
                     styles(:fill=>'none', :stroke=>'purple', :stroke_width=>10, :stroke_dasharray=>[10,5])

data/doc/ex/stegano.rb

@@ -19,6 +19,7 @@ begin
     # Embed the watermark starting at offset 91.
     puts 'Embedding watermark...'
     stegano = img.stegano(watermark, 91)
+    puts 'Watermark embedded'
 
     # Write the watermarked image in MIFF format. Note that
     # the format must be lossless - Image#stegano doesn't work
@@ -29,14 +30,29 @@ begin
     # attribute describes the size and offset of the watermark.
 
     # This can take some time. Keep track of how far along we are.
-    monitor = Proc.new { |text, quantum, span|
-        printf("%s %3.0f%% complete\n", text, ((1.0-(quantum/span.to_f))*100.0))
-        }
-    Magick.set_monitor(monitor)
-    stegano = Magick::Image.read('stegano:img.miff') {
+    # We have to be careful, though. Recent versions of ImageMagick support the
+    # Info#monitor= method and deprecate Magick.set_monitor, so don't use
+    # Magick.set_monitor if Info#monitor= is supported.
+
+    monitor = Proc.new do |text, quantum, span|
+        printf("Extracting watermark...%3.0f%% complete\n", ((1.0-(quantum/span.to_f))*100.0))
+        true
+        end
+
+    stegano = Magick::Image.read('stegano:img.miff') do
         self.size = Magick::Geometry.new(wmcols, wmrows, 91)
-    }
-    Magick.set_monitor(nil)
+        begin
+            self.monitor = monitor
+        rescue NotImplementedError
+            Magick.set_monitor(monitor)
+        end
+    end
+
+    begin
+        stegano[0].monitor = nil
+    rescue NotImplementedError
+        Magick.set_monitor(nil)
+    end
 
     # We don't need this any more.
     File.delete('img.miff')

data/doc/ex/stroke_fill.rb

@@ -1,8 +1,7 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
-rvg = RVG.new(150, 150) do |canvas|
+rvg = Magick::RVG.new(150, 150) do |canvas|
     canvas.background_fill = ''
     canvas.circle(40, 75, 75).styles(:stroke=>'blue', :fill=>'#00ff00',:stroke_width=>8)
     canvas.rect(149,149).styles(:fill=>'none',:stroke=>'blue')

data/doc/ex/text01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example text01 - 'Hello, out there' in blue"
     canvas.text(250, 150, "Hello, out there").

data/doc/ex/text_styles.rb

@@ -1,9 +1,8 @@
 #! /usr/local/bin/ruby -w
 require 'rvg/rvg'
-include Magick
 
 
-rvg = RVG.new(200, 100) do |canvas|
+rvg = Magick::RVG.new(200, 100) do |canvas|
     canvas.background_fill = 'white'
 
     canvas.g.styles(:font_size=>16) do |grp|

data/doc/ex/tref01.rb

@@ -1,13 +1,12 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 Fill = %w{yellow pink green blue cyan red purple brown}
 
-rvg = RVG.new(6.cm, 6.cm).viewbox(0,0,600,600) do |canvas|
+rvg = Magick::RVG.new(6.cm, 6.cm).viewbox(0,0,600,600) do |canvas|
     canvas.background_fill = 'white'
 
-    ref_text = RVG::Tspan.new("Referenced").styles(:font_size=>52, :font_weight=>'bold')
+    ref_text = Magick::RVG::Tspan.new("Referenced").styles(:font_size=>52, :font_weight=>'bold')
 
     canvas.g.translate(300,270) do |grp|
         angle = 0

data/doc/ex/triangle01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(4.cm, 4.cm).viewbox(0, 0, 400, 400) do |canvas|
+rvg = Magick::RVG.new(4.cm, 4.cm).viewbox(0, 0, 400, 400) do |canvas|
     canvas.title = "Example triangle01 - simple example of a 'path'"
     canvas.desc = 'A path that draws a triangle'
 

data/doc/ex/tspan01.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example tspan01 - using tspan to change visual attributes"
     canvas.g.styles(:font_family=>'Verdana', :font_size=>45) do |grp|

data/doc/ex/tspan02.rb

@@ -1,10 +1,9 @@
 require 'rvg/rvg'
-include Magick
 
-RVG::dpi = 90
+Magick::RVG::dpi = 90
 
 
-rvg = RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.background_fill = 'white'
     canvas.desc = "Example tspan02 - using tspan's dx and dy attributes for incremental positioning adjustments"
     canvas.g.styles(:font_family=>'Verdana', :font_size=>45) do |_g|

data/doc/ex/tspan03.rb

@@ -1,9 +1,8 @@
 require 'rvg/rvg'
-include Magick
 
-RVG.dpi = 90
+Magick::RVG.dpi = 90
 
-rvg = RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
+rvg = Magick::RVG.new(10.cm, 3.cm).viewbox(0,0,1000,300) do |canvas|
     canvas.background_fill = 'white'
 
     canvas.g.translate(100, 60) do |grp|