rmagick 1.15.17 → 2.0.0

data/doc/ex/level.rb

@@ -6,6 +6,6 @@ require 'RMagick'
 before = Magick::Image.read('images/Flower_Hat.jpg').first
 
 # Brighten up the mid-tones a bit.
-after = before.level(0, Magick::MaxRGB, 1.50)
+after = before.level(0, Magick::QuantumRange, 1.50)
 after.write('level.jpg')
 exit

data/doc/ex/matte_floodfill.rb

@@ -1,15 +1,14 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
 
-img = Image.new(200,200)
-img.compression = LZWCompression
+img = Magick::Image.new(200,200)
+img.compression = Magick::LZWCompression
 
-bg = Image.read('plasma:fractal') { self.size = '200x200' }
+bg = Magick::Image.read('plasma:fractal') { self.size = '200x200' }
 bg[0].matte = false
 
-gc = Draw.new
+gc = Magick::Draw.new
 gc.stroke_width(2)
 gc.stroke('black')
 gc.fill('white')
@@ -27,7 +26,7 @@ img = img.matte_floodfill(100, 100)
 
 # Composite the image over a nice bright background
 # so that the transparent pixels will be obvious.
-img = bg[0].composite(img, CenterGravity, OverCompositeOp)
+img = bg[0].composite(img, Magick::CenterGravity, Magick::OverCompositeOp)
 
 img.write('matte_floodfill_after.gif')
 exit

data/doc/ex/matte_replace.rb

@@ -1,15 +1,14 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
 
-img = Image.new(200,200)
-img.compression = LZWCompression
+img = Magick::Image.new(200,200)
+img.compression = Magick::LZWCompression
 
-bg = Image.read('plasma:fractal') { self.size = '200x200' }
+bg = Magick::Image.read('plasma:fractal') { self.size = '200x200' }
 bg[0].matte = false
 
-gc = Draw.new
+gc = Magick::Draw.new
 gc.stroke_width(2)
 gc.stroke('black')
 gc.fill('white')
@@ -34,7 +33,7 @@ img = img.matte_replace(100, 45)
 
 # Composite the image over a nice bright background
 # so that the transparent pixels will be obvious.
-img = bg[0].composite(img, CenterGravity, OverCompositeOp)
+img = bg[0].composite(img, Magick::CenterGravity, Magick::OverCompositeOp)
 
 img.write('matte_replace_after.gif')
 exit

data/doc/ex/negate_channel.rb

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

data/doc/ex/opacity.rb

@@ -1,10 +1,8 @@
 #! /usr/local/bin/ruby -w
-
 require 'RMagick'
-include Magick
 
-canvas = Image.new(260, 125)
-gc = Draw.new
+canvas = Magick::Image.new(260, 125)
+gc = Magick::Draw.new
 gc.fill('black')
 gc.rectangle(10,20, 250,90)
 
@@ -26,7 +24,7 @@ gc.roundrectangle(200,20, 240,90, 5,5)
 
 gc.stroke('transparent')
 gc.fill('black')
-gc.gravity(SouthGravity)
+gc.gravity(Magick::SouthGravity)
 gc.text(-90,20, '"25%%"')
 gc.text(-30,20, '"50%%"')
 gc.text( 30,20, '"75%%"')

data/doc/ex/polaroid.rb

@@ -8,7 +8,10 @@ img = Magick::Image.read('images/Flower_Hat.jpg').first
 img[:Caption] = "\nLosha\n" + Date.today.to_s
 
 begin
-    picture = img.polaroid { self.gravity = Magick::CenterGravity }
+    picture = img.polaroid do
+      self.gravity = Magick::CenterGravity
+      self.border_color = "#f0f0f8"
+    end
 
     # Composite it on a white background so the result is opaque.
     background = Magick::Image.new(picture.columns, picture.rows)

data/doc/ex/posterize.rb

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

data/doc/ex/preview.rb

@@ -3,14 +3,7 @@
 require 'RMagick'
 
 img = Magick::Image.read("images/Flower_Hat.jpg").first
-
-begin
-    preview = img.preview(Magick::SolarizePreview)
-rescue NotImplementedError
-    img = Magick::Image.read('images/notimplemented.gif').first
-    img.write('preview.jpg')
-    exit
-end
+preview = img.preview(Magick::SolarizePreview)
 preview.minify.write('preview.jpg')
 exit
 

data/doc/ex/radial_blur.rb

@@ -4,16 +4,6 @@ require 'RMagick'
 # Demonstrate the Image#radial_blur method
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
-
-# Make a blurry copy.
-begin
-    result = img.radial_blur(10.0)
-
-# 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.radial_blur(10.0)
 result.write('radial_blur.jpg')
 exit

data/doc/ex/raise.rb

@@ -1,11 +1,8 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
-include Magick
 
 # Demonstrate the Image#raise method.
-img = Image.read('images/Flower_Hat.jpg').first
-
+img = Magick::Image.read('images/Flower_Hat.jpg').first
 img = img.raise
-
 img.write('raise.jpg')
 exit

data/doc/ex/random_threshold_channel.rb

@@ -1,18 +1,13 @@
-#!/home/software/ruby-1.6.8/bin/ruby -w
+#!/usr/local/bin/ruby -w
 
 # Demonstrate the random_channel_threshold method
 
 require 'RMagick'
-include Magick
 
-img = Image.read('images/Flower_Hat.jpg').first
+img = Magick::Image.read('images/Flower_Hat.jpg').first
 
-begin
-    geom = Geometry.new(MaxRGB/2)
-    img2 = img.random_threshold_channel(geom, RedChannel)
-rescue NotImplementedError
-    img2 = Image.read('images/notimplemented.gif').first
-end
+geom = Magick::Geometry.new(Magick::QuantumRange/2)
+img2 = img.random_threshold_channel(geom, Magick::RedChannel)
 
 img2.write('random_threshold_channel.jpg')
 exit

data/doc/ex/sepiatone.rb

@@ -1,15 +1,8 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
-
-img = Image.read('images/Flower_Hat.jpg').first
-
-begin
-    sepiatone = img.sepiatone(MaxRGB * 0.8)
-rescue NotImplementedError
-    sepiatone = Image.read('images/notimplemented.gif').first
-end
 
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+sepiatone = img.sepiatone(Magick::QuantumRange * 0.8)
 sepiatone.write('sepiatone.jpg')
 

data/doc/ex/shadow.rb

@@ -1,9 +1,8 @@
 require 'RMagick'
-include Magick
 
 # Draw a big red Bezier curve on a transparent background.
-img = Image.new(340, 120) {self.background_color = 'none'}
-gc = Draw.new
+img = Magick::Image.new(340, 120) {self.background_color = 'none'}
+gc = Magick::Draw.new
 gc.fill('none')
 gc.stroke('red')
 gc.stroke_linecap('round')
@@ -14,24 +13,19 @@ gc.draw(img)
 # Composite it onto a white background, draw a border around the result,
 # write it to the "before" file.
 before = img.copy
-bg = Image.new(before.columns, before.rows) {self.background_color='white'}
-before = bg.composite(before, CenterGravity, OverCompositeOp)
+bg = Magick::Image.new(before.columns, before.rows) {self.background_color='white'}
+before = bg.composite(before, Magick::CenterGravity, Magick::OverCompositeOp)
 before.border!(1,1,'gray80')
 before.write('shadow_before.gif')
 
-begin
-    # Create the shadow.
-    shadow = img.shadow()
-    # Composite the original image over the shadow, composite the result
-    # onto a white background, add a border, write it to the "after" file.
-    shadow = shadow.composite(img, NorthWestGravity, OverCompositeOp)
-    bg = Image.new(shadow.columns, shadow.rows) {self.background_color='white'}
-    after = bg.composite(shadow, CenterGravity, OverCompositeOp)
-    after.border!(1,1,'gray80')
-rescue NotImplementedError
-    after = Image.read('images/notimplemented.gif').first
-    after.resize!(before.columns, before.rows)
-end
+# Create the shadow.
+shadow = img.shadow()
+# Composite the original image over the shadow, composite the result
+# onto a white background, add a border, write it to the "after" file.
+shadow = shadow.composite(img, Magick::NorthWestGravity, Magick::OverCompositeOp)
+bg = Magick::Image.new(shadow.columns, shadow.rows) {self.background_color='white'}
+after = bg.composite(shadow, Magick::CenterGravity, Magick::OverCompositeOp)
+after.border!(1,1,'gray80')
 
 after.write('shadow_after.gif')
 

data/doc/ex/sketch.rb

@@ -11,15 +11,8 @@ sketch = img.quantize(256, Magick::GRAYColorspace)
 sketch = sketch.equalize
 
 # Sketch, then dissolve 25% of the original back in
-begin
-    sketch = sketch.sketch(0, 10, 135)
-    img = img.dissolve(sketch, 0.75, 0.25)
-
-rescue NotImplementedError
-    not_impl = Magick::Image.read('images/notimplemented.gif').first
-    not_impl.resize!(img.columns, img.rows)
-    img = not_impl
-end
+sketch = sketch.sketch(0, 10, 135)
+img = img.dissolve(sketch, 0.75, 0.25)
 
 img.write('sketch.jpg')
 

data/doc/ex/smile.rb

@@ -101,20 +101,20 @@ SmileBits = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0 ]
 
-	img = Image.new(SmileWidth, SmileHeight)
-    
+  img = Image.new(SmileWidth, SmileHeight)
+
     q = Array.new                           # Create an array of pixels one
     SmileWidth.times do                     # row long
         q << Magick::Pixel.new(0,0,0,0)
     end
 
-	n = 0
+  n = 0
     SmileHeight.times do |y|                # Store pixels a row at a time
         SmileWidth.times do |x|             # Build a row of pixels
-            q[x].red   = MaxRGB * SmileBits[n]
-            q[x].green = MaxRGB * SmileBits[n]
-            q[x].blue  = MaxRGB * SmileBits[n]
-			n += 1
+            q[x].red   = QuantumRange * SmileBits[n]
+            q[x].green = QuantumRange * SmileBits[n]
+            q[x].blue  = QuantumRange * SmileBits[n]
+      n += 1
         end
                                             # Store the row of pixels
         img.store_pixels(0, y, SmileWidth, 1, q)

data/doc/ex/splice.rb

@@ -1,16 +1,9 @@
 #! /usr/local/bin/ruby -w
 require 'RMagick'
-include Magick
 
 # Demonstrate the splice method.
 
-img = Image.read('images/Flower_Hat.jpg').first
-
-begin
-    spliced_img = img.splice(img.columns/2, img.rows/2, 20, 20, 'gray80')
-    spliced_img.write('splice.jpg')
-rescue NotImplementedError
-    not_implemented = Magick::Image.read("images/notimplemented.gif").first
-    not_implemented.write('splice.jpg')
-end
+img = Magick::Image.read('images/Flower_Hat.jpg').first
+spliced_img = img.splice(img.columns/2, img.rows/2, 20, 20, 'gray80')
+spliced_img.write('splice.jpg')
 

data/doc/ex/stegano.rb

@@ -29,6 +29,8 @@ begin
     # Read the image and retrieve the watermark. The size
     # 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 do |text, quantum, span|
         printf("Extracting watermark...%3.0f%% complete\n", ((1.0-(quantum/span.to_f))*100.0))
         true
@@ -36,8 +38,11 @@ begin
 
     stegano = Magick::Image.read('stegano:img.miff') do
         self.size = Magick::Geometry.new(wmcols, wmrows, 91)
+        self.monitor = monitor
     end
 
+    stegano[0].monitor = nil
+
     # We don't need this any more.
     File.delete('img.miff')
 

data/doc/ex/threshold.rb

@@ -5,8 +5,8 @@ require 'RMagick'
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
 
-# Use a threshold of 55% of MaxRGB.
-img = img.threshold(Magick::MaxRGB*0.55)
+# Use a threshold of 55% of QuantumRange.
+img = img.threshold(Magick::QuantumRange*0.55)
 
 #img.display
 img.write('threshold.jpg')

data/doc/ex/transpose.rb

@@ -4,13 +4,6 @@ require 'RMagick'
 # Demonstrate the Image#transpose method
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
-
-begin
-    img = img.transpose
-rescue NotImplementedError
-    not_implemented = Magick::Image.read("images/notimplemented.gif").first
-    not_implemented.resize!(img.columns, img.rows)
-    img = not_implemented
-end
+img = img.transpose
 img.write('transpose.jpg')
 exit

data/doc/ex/transverse.rb

@@ -4,13 +4,6 @@ require 'RMagick'
 # Demonstrate the Image#transverse method
 
 img = Magick::Image.read('images/Flower_Hat.jpg').first
-
-begin
-    img = img.transverse
-rescue NotImplementedError
-    not_implemented = Magick::Image.read("images/notimplemented.gif").first
-    not_implemented.resize!(img.columns, img.rows)
-    img = not_implemented
-end
+img = img.transverse
 img.write('transverse.jpg')
 exit

data/doc/ex/trim.rb

@@ -1,10 +1,9 @@
 require 'RMagick'
-include Magick
 
 # Demonstrate the trim method
 
 # Read the Flower_Hat image and reduce it to 80% of its original size.
-img = Image.read('images/Flower_Hat.jpg').first
+img = Magick::Image.read('images/Flower_Hat.jpg').first
 cols = img.columns
 rows = img.rows
 img.resize!(0.80)

data/doc/ex/viewex.rb

@@ -1,16 +1,15 @@
 #! /usr/local/bin/ruby -w
 
 require 'RMagick'
-include Magick
 
-img = Image.new(40, 40) {self.background_color = 'lightcyan2'}
+img = Magick::Image.new(40, 40) {self.background_color = 'lightcyan2'}
 
 # The view is 400 pixels square, starting
 # column 10, row 5 from the top of the image.
 img.view( 10, 5, 20, 20) do |view|
 
     # Set all the pixels in the view to green.
-    view[][] = Pixel.new(0, MaxRGB)
+    view[][] = Magick::Pixel.new(0, Magick::QuantumRange)
 
     # Change the top and bottom rows to red.
     view[0][] = 'red'
@@ -24,11 +23,11 @@ img.view( 10, 5, 20, 20) do |view|
 
     # Change the green channel of all the
     # pixels on row 8.
-    view[8][].green = MaxRGB/2
+    view[8][].green = Magick::QuantumRange/2
 
     # Change the blue channel of 8 pixels
     # on column 10.
-    view[4,8][10].blue = MaxRGB
+    view[4,8][10].blue = Magick::QuantumRange
 end
 
 img.scale(5).write("viewex.gif")