rmagick 1.15.17 → 2.0.0

data/doc/ex/adaptive_threshold.rb

@@ -4,16 +4,7 @@ require 'RMagick'
 # Demonstrate the Image#adaptive_threshold method
 
 img = Magick::Image.read("images/Flower_Hat.jpg").first
-
-begin
-    result = img.adaptive_threshold
-
-# Substitute the standard "Not Implemented" image
-rescue NotImplementedError
-    result = Magick::Image.read("images/notimplemented.gif").first
-    result.resize!(img.columns, img.rows)
-end
-
+result = img.adaptive_threshold
 result.write("adaptive_threshold.jpg")
 exit
 

data/doc/ex/add_noise.rb

@@ -1,12 +1,11 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
-include Magick
 
 # Demonstrate the Image#add_noise method
-NOISE_TYPES = [UniformNoise, GaussianNoise,
-               MultiplicativeGaussianNoise,
-               ImpulseNoise, LaplacianNoise,
-               PoissonNoise]
+NOISE_TYPES = [Magick::UniformNoise, Magick::GaussianNoise,
+               Magick::MultiplicativeGaussianNoise,
+               Magick::ImpulseNoise, Magick::LaplacianNoise,
+               Magick::PoissonNoise]
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
 

data/doc/ex/axes.rb

@@ -14,7 +14,7 @@ canvas.new_image(250, 250, Magick::HatchFill.new('white', 'gray90'))
 border = Magick::Draw.new
 border.stroke('thistle')
 border.fill_opacity(0)
-border.rectangle(0,0, canvas.columns-1, canvas.rows-1)
+border.rectangle(0,0, canvas.rows-1, canvas.columns-1)
 border.draw(canvas)
 
 # Draw gold axes with arrow-heads.

data/doc/ex/bilevel_channel.rb

@@ -1,20 +1,9 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
-
-img = Image.read('images/Flower_Hat.jpg').first
-
-begin
-
-result = img.bilevel_channel(2*MaxRGB/3, RedChannel)
-
-# Substitute the standard "Not Implemented" image
-rescue NotImplementedError
-    result = Magick::Image.read("images/notimplemented.gif").first
-    result.resize!(img.columns, img.rows)
-end
 
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+result = img.bilevel_channel(2*Magick::QuantumRange/3, Magick::RedChannel)
 result.write('bilevel_channel.jpg')
 exit
 

data/doc/ex/bounding_box.rb

@@ -1,11 +1,10 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
-include Magick
 
-img = Image.new(200,200) { self.background_color = "#ffffcc" }
+img = Magick::Image.new(200,200) { self.background_color = "#ffffcc" }
 
 # Draw a blue circle.
-gc = Draw.new
+gc = Magick::Draw.new
 gc.stroke_width(5)
 gc.stroke("blue")
 gc.fill_opacity(0)
@@ -17,7 +16,7 @@ gc.draw(img)
 # the corners with tiny red circles.
 
 bb = img.bounding_box
-gc = Draw.new
+gc = Magick::Draw.new
 gc.stroke("gray50")
 gc.fill_opacity(0)
 gc.rectangle(bb.x, bb.y, bb.x+bb.width, bb.y+bb.height)

data/doc/ex/channel.rb

@@ -1,17 +1,16 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
 
-img = Image.read('images/Flower_Hat.jpg').first
-imgs = ImageList.new
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+imgs = Magick::ImageList.new
 
 imgs << img
-imgs << img.channel(RedChannel)
+imgs << img.channel(Magick::RedChannel)
 imgs.cur_image['Label'] = 'RedChannel'
-imgs <<  img.channel(GreenChannel)
+imgs <<  img.channel(Magick::GreenChannel)
 imgs.cur_image['Label'] = 'GreenChannel'
-imgs << img.channel(BlueChannel)
+imgs << img.channel(Magick::BlueChannel)
 imgs.cur_image['Label'] = 'BlueChannel'
 
 result = imgs.montage {
@@ -19,7 +18,7 @@ result = imgs.montage {
     self.background_color = 'black'
     self.stroke = 'transparent'
     self.fill = 'white'
-    self.geometry = Geometry.new(img.columns/2, img.rows/2, 5, 5)
+    self.geometry = Magick::Geometry.new(img.columns/2, img.rows/2, 5, 5)
     }
 
 result.write('channel.jpg')

data/doc/ex/clip_path.rb

@@ -26,12 +26,14 @@ girl.read("images/Flower_Hat.jpg")
 cols = rows = nil
 
 # Our final image is about 290 pixels wide, so here
-# we widen our picture to fit.
+# we widen our picture to fit. The change_geometry
+# method will adjust the height proportionately.
 
-girl.resize!(290.0/girl.columns)
-cols = girl.columns
-rows = girl.rows
-pr.composite(0, 0, cols, rows, girl)
+girl.change_geometry("290") do |c,r|
+    pr.composite(0,0, c, r, girl)
+    cols = c
+    rows = r
+end
 
 pr.pop
 
@@ -48,6 +50,10 @@ canvas = canvas.blur_image(0, 20)
 # Draw the star over the background
 pr.draw(canvas)
 
+# Crop away all the solid white border pixels.
+crop = canvas.bounding_box
+canvas.crop!(crop.x, crop.y, crop.width, crop.height)
+
 canvas.write("clip_path.gif")
 
 exit

data/doc/ex/color_histogram.rb

@@ -1,32 +1,21 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
 
 NUM_COLORS = 256
 HIST_HEIGHT = 200
 
-img = Image.read('images/Hot_Air_Balloons_H.jpg').first
+img = Magick::Image.read('images/Hot_Air_Balloons_H.jpg').first
 img = img.quantize(NUM_COLORS)
 
-begin
-    hist = img.color_histogram
-rescue NotImplementedError
-    img = Image.read('images/notimplemented.gif').first
-    img.write('color_histogram.gif')
-    exit
-end
+hist = img.color_histogram
 
 # sort pixels by increasing count
-begin
-    pixels = hist.keys.sort_by {|pixel| hist[pixel] }
-rescue NameError    # No sort_by?
-    pixels = hist.keys.sort { |p, q| hist[p] <=> hist[q] }
-end
+pixels = hist.keys.sort_by {|pixel| hist[pixel] }
 
 scale = HIST_HEIGHT / (hist.values.max*1.025)   # put 2.5% air at the top
 
-gc = Draw.new
+gc = Magick::Draw.new
 gc.stroke_width(1)
 gc.affine(1, 0, 0, -scale, 0, HIST_HEIGHT)
 
@@ -39,21 +28,20 @@ pixels.each { |pixel|
     start = start.succ
 }
 
-hatch = HatchFill.new("white", "gray95")
-canvas = Image.new(NUM_COLORS, HIST_HEIGHT, hatch)
+hatch = Magick::HatchFill.new("white", "gray95")
+canvas = Magick::Image.new(NUM_COLORS, HIST_HEIGHT, hatch)
 gc.draw(canvas)
 
-text = Draw.new
+text = Magick::Draw.new
 text.annotate(canvas, 0, 0, 0, 20, "Color Frequency\nHistogram") {
     self.pointsize = 10
-    self.gravity = NorthGravity
+    self.gravity = Magick::NorthGravity
     self.stroke = 'transparent'
     }
 
 canvas.border!(1, 1, "white")
 canvas.border!(1, 1, "black")
 canvas.border!(3, 3, "white")
-#canvas.display
 canvas.write("color_histogram.gif")
 
 exit

data/doc/ex/composite_layers.rb

@@ -0,0 +1,53 @@
+#! /usr/local/bin/ruby -w
+require 'RMagick'
+
+class Magick::ImageList
+  # Create a shadow image for each image in the list
+  def shadow(x_offset = 4, y_offset = 4, sigma = 4.0, opacity = 1.0)
+    return collect { |frame| frame.shadow(x_offset, y_offset, sigma, opacity) }
+  end
+end
+
+ruby = Magick::ImageList.new
+
+# Draw a rotating "Ruby" animation
+gc = Magick::Draw.new
+gc.gravity = Magick::CenterGravity
+gc.pointsize = 24
+gc.font_weight = Magick::BoldWeight
+gc.fill = "darkred"
+gc.stroke = "black"
+gc.stroke_width = 1
+
+23.times do
+  ruby << Magick::Image.new(100, 100) {self.background_color = "none"}
+  gc.annotate(ruby, 0, 0, 0, 0, "Ruby")
+  gc.rotation = 15
+end
+
+# Create a gradient background
+bg = Magick::ImageList.new
+bg.new_image(99, 99, Magick::GradientFill.new(50, 50, 50, 50, "white", "tan"))
+bg.border!(1, 1, "black")
+
+# Create the animated shadows of the rotating "Ruby" animation
+shadows = ruby.shadow(2, 5, 3)
+
+# Composite the shadow animation over the background. Since there is only one
+# background image, it will replicated for each frame in the shadow animation.
+begin
+  result = bg.composite_layers(shadows)
+
+  # Composite the "Ruby" animation over the previous composite
+  result = result.composite_layers(ruby)
+  result.delay = 10
+  result.write("composite_layers.gif")
+  result[0].write("composite_layers1.gif")
+
+rescue NotImplementedError
+    result = Magick::Image.read('images/notimplemented.gif').first
+    result.resize!(100, 100)
+    result.write("composite_layers.gif")
+    result.write("composite_layers1.gif")
+end
+exit

data/doc/ex/fill_pattern.rb

@@ -0,0 +1,26 @@
+#! /usr/local/bin/ruby -w
+require 'RMagick'
+
+# Demonstrate the Magick::Draw#fill_pattern and #stroke_pattern attributes.
+
+temp = Magick::ImageList.new
+temp << Magick::Image.new(5, 10) {self.background_color = "black"}
+temp << Magick::Image.new(5, 10) {self.background_color = "gold"}
+stroke_pattern = temp.append(false)
+
+img = Magick::Image.new(280, 250) {self.background_color = "none"}
+
+gc = Magick::Draw.new
+gc.annotate(img, 0, 0, 0, 0, "PATT\nERNS") do
+    self.gravity = Magick::CenterGravity
+    self.font_weight = Magick::BoldWeight
+    self.pointsize = 100
+    self.fill_pattern = Magick::Image.read("images/Flower_Hat.jpg").first
+    self.stroke_width = 5
+    self.stroke_pattern = stroke_pattern
+end
+
+img.write("fill_pattern.gif")
+
+
+

data/doc/ex/get_multiline_type_metrics.rb

@@ -1,53 +1,42 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
 
-include Magick
-
 TEXT = 'get\nmultiline\ntype\nmetrics'
 
-background = Image.new(200, 200)
-gc = Draw.new
+background = Magick::Image.new(200, 200)
+gc = Magick::Draw.new
 
 # Draw the text centered on the background
 gc.annotate(background, 0, 0, 0, 0, TEXT) do
     gc.font_family = 'Verdana'
     gc.pointsize = 36
-    gc.gravity = CenterGravity
+    gc.gravity = Magick::CenterGravity
     gc.stroke = 'none'
 end
 
-begin
-
-    # Get the metrics
-    metrics = gc.get_multiline_type_metrics(background, TEXT)
-
-    # Compute the corners for a rectangle surrounding the text
-    x = (background.columns - metrics.width) / 2
-    y = (background.rows - metrics.height) / 2
-
-    # Draw 2 rectangles over the text.
-    gc = Draw.new
-    gc.stroke('red')
-    gc.stroke_width(5)
-    gc.stroke_linejoin('round')
-    gc.fill('cyan')
-    gc.fill_opacity(0.10)
-    gc.rectangle(x, y, x+metrics.width, y+metrics.height)
-
-    gc.stroke('white')
-    gc.stroke_width(1)
-    gc.fill('none')
-    gc.rectangle(x, y, x+metrics.width, y+metrics.height)
-    gc.draw(background)
-
-    background.border!(1,1, 'blue')
-
-# Substitute the standard "Not Implemented" image
-rescue NotImplementedError
-    not_implemented = Magick::Image.read("images/notimplemented.gif").first
-    not_implemented.resize!(background.columns, background.rows)
-    background = not_implemented
-end
+# Get the metrics
+metrics = gc.get_multiline_type_metrics(background, TEXT)
+
+# Compute the corners for a rectangle surrounding the text
+x = (background.columns - metrics.width) / 2
+y = (background.rows - metrics.height) / 2
+
+# Draw 2 rectangles over the text.
+gc = Magick::Draw.new
+gc.stroke('red')
+gc.stroke_width(5)
+gc.stroke_linejoin('round')
+gc.fill('cyan')
+gc.fill_opacity(0.10)
+gc.rectangle(x, y, x+metrics.width, y+metrics.height)
+
+gc.stroke('white')
+gc.stroke_width(1)
+gc.fill('none')
+gc.rectangle(x, y, x+metrics.width, y+metrics.height)
+gc.draw(background)
+
+background.border!(1,1, 'blue')
 
 background.write('get_multiline_type_metrics.gif')
 

data/doc/ex/get_type_metrics.rb

@@ -1,28 +1,28 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
-include Magick
 
 # Add a method for drawing braces.
-class Draw
-
-    # (w,h) - width & height of rectangle enclosing brace.
-    # Normally the brace is drawn with its opening to the
-    # left and its lower point on the origin.
-    #
-    # Set w < 0 to draw right-opening brace. Set h < 0 to
-    # position top point at origin.
-    #
-    # The placement & orientation is affected by the
-    # current user coordinate system.
-    def brace(w, h)
-        raise(ArgumentError, "width must be != 0") unless w != 0
-        raise(ArgumentError, "height must be != 0") unless h != 0
-        path("M0,0 Q#{w},0 #{w/2.0},#{-h/4.0} T#{w},#{-h/2.0}" +
-             "Q0,#{-h/2.0} #{w/2.0},#{-(3.0*h/4.0)} T0,#{-h}")
-    end
-
-end     # class Draw
-
+module Magick
+    class Draw
+
+        # (w,h) - width & height of rectangle enclosing brace.
+        # Normally the brace is drawn with its opening to the
+        # left and its lower point on the origin.
+        #
+        # Set w < 0 to draw right-opening brace. Set h < 0 to
+        # position top point at origin.
+        #
+        # The placement & orientation is affected by the
+        # current user coordinate system.
+        def brace(w, h)
+            raise(ArgumentError, "width must be != 0") unless w != 0
+            raise(ArgumentError, "height must be != 0") unless h != 0
+            path("M0,0 Q#{w},0 #{w/2.0},#{-h/4.0} T#{w},#{-h/2.0}" +
+                 "Q0,#{-h/2.0} #{w/2.0},#{-(3.0*h/4.0)} T0,#{-h}")
+        end
+
+    end     # class Draw
+end
 
 
 
@@ -31,11 +31,11 @@ Origin_y = 230
 Glyph = 'g'
 Face = ARGV[0] ? ARGV[0] : "Times"
 
-canvas = Image.new(410,320,HatchFill.new('white', 'lightcyan2'))
+canvas = Magick::Image.new(410, 320, Magick::HatchFill.new('white', 'lightcyan2'))
 
 # Draw a big lowercase 'g' on the canvas. Leave room on all sides for
 # the labels. Use 'undercolor' to set off the glyph.
-glyph = Draw.new
+glyph = Magick::Draw.new
 glyph.annotate(canvas, 0, 0, Origin_x, Origin_y, Glyph) do
     glyph.pointsize = 124
     glyph.stroke = 'none'
@@ -47,7 +47,7 @@ end
 # Call get_type_metrics. This is what this example's all about.
 metrics = glyph.get_type_metrics(canvas, Glyph)
 
-gc = Draw.new
+gc = Magick::Draw.new
 gc.translate(Origin_x, Origin_y)
 
 # Draw the origin as a big red dot.
@@ -88,7 +88,7 @@ gc.draw(canvas)
 
 # Draw the braces and labels. Position the braces by transforming the
 # user coordinate system with translate and rotate methods.
-gc = Draw.new
+gc = Magick::Draw.new
 gc.font_family('Times')
 gc.pointsize(13)
 gc.fill('none')