rmagick 1.15.17 → 2.0.0

data/examples/crop_with_gravity.rb

@@ -0,0 +1,46 @@
+#! /usr/local/bin/ruby -w
+
+#=======================================================#
+# Thanks to Robert Wagner for the idea of allowing a    #
+# GravityType instead of the x- and y-offset arguments! #
+#=======================================================#
+
+# Demo the use of the GravityType argument to Image#crop.
+
+require 'RMagick'
+include Magick
+
+shorts = Image.read('../doc/ex/images/Shorts.jpg').first
+
+regwidth = shorts.columns/2
+regheight = shorts.rows/2
+
+mask = Image.new(regwidth, regheight) { self.background_color = 'white'}
+mask.opacity = 0.50 * TransparentOpacity
+
+black = Image.new(shorts.columns, shorts.rows) {self.background_color = 'black'}
+pairs = ImageList.new
+
+[NorthWestGravity, NorthGravity, NorthEastGravity,
+ WestGravity, CenterGravity, EastGravity,
+ SouthWestGravity, SouthGravity, SouthEastGravity].each do |gravity|
+    pattern = shorts.composite(mask, gravity, OverCompositeOp)
+    cropped = shorts.crop(gravity, regwidth, regheight)
+    result = black.composite(cropped, gravity, OverCompositeOp)
+    result.border_color = "white"
+    pairs << pattern
+    pairs << result
+end
+
+# Montage into a single image
+montage = pairs.montage {
+    self.geometry = "#{pairs.columns}x#{pairs.rows}+0+0"
+    self.tile = "6x3"
+    self.border_width = 1
+    }
+montage.write('crop_with_gravity.miff')
+#montage.display
+
+
+
+

data/examples/demo.rb

@@ -17,12 +17,12 @@ Font = "Helvetica"
 begin
     puts "Read images..."
 
-    model = ImageList.new("images/model.miff")
+    model = ImageList.new("../doc/ex/images/model.miff")
     model.border_color = "black"
     model.background_color = "black"
     model.cur_image[:Label] = "RMagick"
 
-    smile = ImageList.new("images/smile.miff")
+    smile = ImageList.new("../doc/ex/images/smile.miff")
     smile.border_color = "black"
     smile.cur_image[:Label] = "Smile"
 

data/examples/histogram.rb

@@ -9,14 +9,14 @@ class PixelColumn < Array
         super
         fill {Magick::Pixel.new}
     end
-    
+
     def reset(bg)
         each {|pixel| pixel.reset(bg)}
     end
 end
 
 module Magick
-    
+
     class Pixel
         def reset(bg)
             self.red = bg.red
@@ -25,7 +25,7 @@ module Magick
             self.opacity = bg.opacity
         end
     end
-    
+
     class Image
 
       private
@@ -82,28 +82,28 @@ module Magick
 
                     yf = Float(y)
                     if yf >= HISTOGRAM_ROWS - (red[x] * scale)
-                        red_column[y].red = MaxRGB
+                        red_column[y].red = QuantumRange
                         red_column[y].green = 0
                         red_column[y].blue = 0
-                        rgb_column[y].red = MaxRGB
+                        rgb_column[y].red = QuantumRange
                     end
                     if yf >= HISTOGRAM_ROWS - (green[x] * scale)
-                        green_column[y].green = MaxRGB
+                        green_column[y].green = QuantumRange
                         green_column[y].red = 0
                         green_column[y].blue = 0
-                        rgb_column[y].green = MaxRGB
+                        rgb_column[y].green = QuantumRange
                     end
                     if yf >= HISTOGRAM_ROWS - (blue[x] * scale)
-                        blue_column[y].blue = MaxRGB
+                        blue_column[y].blue = QuantumRange
                         blue_column[y].red = 0
                         blue_column[y].green = 0
-                        rgb_column[y].blue = MaxRGB
+                        rgb_column[y].blue = QuantumRange
                     end
                     if yf >= HISTOGRAM_ROWS - (int[x] * scale)
                         int_column[y].opacity = TransparentOpacity
                     end
                 end
-    
+
                 rgb_histogram.store_pixels(  x, 0, 1, HISTOGRAM_ROWS, rgb_column)
                 red_histogram.store_pixels(  x, 0, 1, HISTOGRAM_ROWS, red_column)
                 green_histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, green_column)
@@ -228,7 +228,7 @@ Colors: #{number_colors}
             # Scale to chart size. When computing the scale, add some "air" between
             # the max frequency and the top of the histogram. This makes a prettier chart.
             # The RGBA and intensity histograms are all drawn to the same scale.
-            
+
             max = [red.max, green.max, blue.max, alpha.max, int.max].max
             scale = HISTOGRAM_ROWS / (max*AIR_FACTOR)
 

data/examples/identify.rb

@@ -12,11 +12,11 @@ module Magick
             puts "\tGeometry: #{columns}x#{rows}\n"
             puts "\tClass: #{class_type.to_s}\n"
             puts "\tType: #{image_type.to_s}\n"
-            puts "\tEndianess: #{endian}\n" 
+            puts "\tEndianess: #{endian}\n"
             puts "\tColorspace: #{colorspace}\n"
             puts "\tChannelDepth:\n"
             color_space = gray? ? Magick::GrayColorspace : colorspace
-            case color_space 
+            case color_space
             when Magick::RGBColorspace
                 puts "\t\tRed: #{channel_depth(Magick::RedChannel)}-bits\n"
                 puts "\t\tGreen: #{channel_depth(Magick::GreenChannel)}-bits\n"
@@ -32,59 +32,59 @@ module Magick
                 puts "\t\tGray: #{channel_depth(Magick::GrayChannel)}-bits\n"
                 puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
             end
-            scale = Magick::MaxRGB / (Magick::MaxRGB >> (Magick::QuantumDepth-channel_depth))
+            scale = Magick::QuantumRange / (Magick::QuantumRange >> (Magick::QuantumDepth-channel_depth))
             puts "\tChannel statistics:\n"
             case color_space
             when Magick::RGBColorspace
                 puts "\t\tRed:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[0]/scale, channel_extrema(Magick::RedChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[1]/scale, channel_extrema(Magick::RedChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[0]/scale, channel_mean(Magick::RedChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[1]/scale, channel_mean(Magick::RedChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[0]/scale, channel_extrema(Magick::RedChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::RedChannel)[1]/scale, channel_extrema(Magick::RedChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[0]/scale, channel_mean(Magick::RedChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::RedChannel)[1]/scale, channel_mean(Magick::RedChannel)[1]/Magick::QuantumRange)
                 puts "\t\tGreen:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[0]/scale, channel_extrema(Magick::GreenChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[1]/scale, channel_extrema(Magick::GreenChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[0]/scale, channel_mean(Magick::GreenChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[1]/scale, channel_mean(Magick::GreenChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[0]/scale, channel_extrema(Magick::GreenChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GreenChannel)[1]/scale, channel_extrema(Magick::GreenChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[0]/scale, channel_mean(Magick::GreenChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GreenChannel)[1]/scale, channel_mean(Magick::GreenChannel)[1]/Magick::QuantumRange)
                 puts "\t\tBlue:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[0]/scale, channel_extrema(Magick::BlueChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[1]/scale, channel_extrema(Magick::BlueChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[0]/scale, channel_mean(Magick::BlueChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[1]/scale, channel_mean(Magick::BlueChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[0]/scale, channel_extrema(Magick::BlueChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlueChannel)[1]/scale, channel_extrema(Magick::BlueChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[0]/scale, channel_mean(Magick::BlueChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlueChannel)[1]/scale, channel_mean(Magick::BlueChannel)[1]/Magick::QuantumRange)
             when Magick::CMYKColorspace
                 puts "\t\tCyan:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[0]/scale, channel_extrema(Magick::CyanChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[1]/scale, channel_extrema(Magick::CyanChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[0]/scale, channel_mean(Magick::CyanChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[1]/scale, channel_mean(Magick::CyanChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[0]/scale, channel_extrema(Magick::CyanChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::CyanChannel)[1]/scale, channel_extrema(Magick::CyanChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[0]/scale, channel_mean(Magick::CyanChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::CyanChannel)[1]/scale, channel_mean(Magick::CyanChannel)[1]/Magick::QuantumRange)
                 puts "\t\tMagenta:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[0]/scale, channel_extrema(Magick::MagentaChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[1]/scale, channel_extrema(Magick::MagentaChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[0]/scale, channel_mean(Magick::MagentaChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[1]/scale, channel_mean(Magick::MagentaChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[0]/scale, channel_extrema(Magick::MagentaChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[1]/scale, channel_extrema(Magick::MagentaChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[0]/scale, channel_mean(Magick::MagentaChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::MagentaChannel)[1]/scale, channel_mean(Magick::MagentaChannel)[1]/Magick::QuantumRange)
                 puts "\t\tYellow:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[0]/scale, channel_extrema(Magick::YellowChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[1]/scale, channel_extrema(Magick::YellowChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[0]/scale, channel_mean(Magick::YellowChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[1]/scale, channel_mean(Magick::YellowChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[0]/scale, channel_extrema(Magick::YellowChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::YellowChannel)[1]/scale, channel_extrema(Magick::YellowChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[0]/scale, channel_mean(Magick::YellowChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::YellowChannel)[1]/scale, channel_mean(Magick::YellowChannel)[1]/Magick::QuantumRange)
                 puts "\t\tBlack:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[0]/scale, channel_extrema(Magick::BlackChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[1]/scale, channel_extrema(Magick::BlackChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[0]/scale, channel_mean(Magick::BlackChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[1]/scale, channel_mean(Magick::BlackChannel)[1]/Magick::MaxRGB)             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[0]/scale, channel_extrema(Magick::BlackChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::BlackChannel)[1]/scale, channel_extrema(Magick::BlackChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[0]/scale, channel_mean(Magick::BlackChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::BlackChannel)[1]/scale, channel_mean(Magick::BlackChannel)[1]/Magick::QuantumRange)
             when Magick::GrayColorspace
                 puts "\t\tGray:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[0]/scale, channel_extrema(Magick::GrayChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[1]/scale, channel_extrema(Magick::GrayChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[0]/scale, channel_mean(Magick::GrayChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[1]/scale, channel_mean(Magick::GrayChannel)[1]/Magick::MaxRGB)                             
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[0]/scale, channel_extrema(Magick::GrayChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::GrayChannel)[1]/scale, channel_extrema(Magick::GrayChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[0]/scale, channel_mean(Magick::GrayChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation: " + sprintf("%g (%g)\n", channel_mean(Magick::GrayChannel)[1]/scale, channel_mean(Magick::GrayChannel)[1]/Magick::QuantumRange)
             end
             if matte
                 puts "\t\tOpacity:\n"
-                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0]/scale, channel_extrema(Magick::OpacityChannel)[0]/Magick::MaxRGB) 
-                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1]/scale, channel_extrema(Magick::OpacityChannel)[1]/Magick::MaxRGB)
-                puts "\t\t\tMean:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[0]/scale, channel_mean(Magick::OpacityChannel)[0]/Magick::MaxRGB)
-                puts "\t\t\tStandard deviation:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[1]/scale, channel_mean(Magick::OpacityChannel)[1]/Magick::MaxRGB)                         
+                puts "\t\t\tMin: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0]/scale, channel_extrema(Magick::OpacityChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tMax: " + sprintf("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1]/scale, channel_extrema(Magick::OpacityChannel)[1]/Magick::QuantumRange)
+                puts "\t\t\tMean:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[0]/scale, channel_mean(Magick::OpacityChannel)[0]/Magick::QuantumRange)
+                puts "\t\t\tStandard deviation:" + sprintf("%u (%g)\n", channel_mean(Magick::OpacityChannel)[1]/scale, channel_mean(Magick::OpacityChannel)[1]/Magick::QuantumRange)
             end
             if class_type == Magick::DirectClass
                 puts "\tColors: #{total_colors}\n"
@@ -157,21 +157,21 @@ module Magick
                     exif_attrs.each do |attr|
                         puts "\t\t#{attr[0]}: #{attr[1]}\n"
                     end
-                end                 
+                end
             end
             puts "\tTainted: True\n" if changed?
             puts "\tTainted: False\n" unless changed?
             puts "\tVersion: #{Magick::Version}\n"
             puts "\t         #{Magick::Magick_version}\n"
-        end        
+        end
     end
 end
 
 if ARGV.length == 0
     puts <<-'END_USAGE'
-    This example displays information about the specified image file(s) 
-    that is similar to ImageMagick/GraphicsMagick's identify command. 
-    
+    This example displays information about the specified image file(s)
+    that is similar to ImageMagick/GraphicsMagick's identify command.
+
     Usage:
     ruby identify.rb filename [filename...]
     END_USAGE
@@ -183,5 +183,5 @@ ilist.each do |img|
     img.identify
 end
 
-exit    
+exit
 

data/examples/spinner.rb

@@ -22,18 +22,19 @@ frame = Magick::Image.new(DIM, DIM) {self.background_color = 'transparent'}
 spinner = Magick::ImageList.new
 
 # 'level' is the change from darkest gray to white
-level = Magick::MaxRGB / 2 / NFRAMES
+level = Magick::QuantumRange / 2 / NFRAMES
 
 NFRAMES.times do |x|
     gc = Magick::Draw.new
     gc.translate(DIM/2, DIM/2)
     gc.stroke('none')
-    intensity = 0.58 * Magick::MaxRGB
+    intensity = 0.58 * Magick::QuantumRange
     fill_color = Magick::Pixel.new(intensity, intensity, intensity).to_color
     gc.fill(fill_color)
     angle = x * (360/NFRAMES)
     NFRAMES.times do
         gc.rotate(angle)
+        intensity = [intensity, Magick::QuantumRange].min
         fill_color = Magick::Pixel.new(intensity, intensity, intensity).to_color
         gc.fill(fill_color)
         gc.roundrectangle(7, -1, 15, 0, 1, 1)

data/ext/RMagick/MANIFEST

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.15.17 - 19:07:42 12/05/08
+MANIFEST for RMagick-2.0.0 - 09:19:16 12/27/07
 
 doc/ilist.html
 doc/scripts/stripeTables.js
@@ -101,6 +101,7 @@ doc/ex/motion_blur.rb
 doc/ex/viewex.rb
 doc/ex/line01.rb
 doc/ex/swirl.rb
+doc/ex/fill_pattern.rb
 doc/ex/qbezierpath.rb
 doc/ex/get_type_metrics.rb
 doc/ex/border.rb
@@ -225,6 +226,7 @@ doc/ex/equalize.rb
 doc/ex/map.rb
 doc/ex/get_pixels.rb
 doc/ex/polyline.rb
+doc/ex/composite_layers.rb
 doc/ex/text01.rb
 doc/ex/crop.rb
 doc/ex/quantize-m.rb
@@ -290,18 +292,18 @@ doc/magick.html
 doc/rvgxform.html
 doc/rvguse.html
 doc/rvgstyle.html
+ext/RMagick/extconf.rb
 ext/RMagick/rminfo.c
 ext/RMagick/rmmain.c
 ext/RMagick/rmfill.c
 ext/RMagick/rmimage.c
-ext/RMagick/rmagick_config.h.in
 ext/RMagick/rmdraw.c
 ext/RMagick/rmilist.c
 ext/RMagick/MANIFEST
 ext/RMagick/rmutil.c
 ext/RMagick/rmagick.h
-ext/RMagick/extconf.rb.in
 post-setup.rb
+examples/crop_with_gravity.rb
 examples/describe.rb
 examples/thumbnail.rb
 examples/find_similar_region.rb
@@ -331,15 +333,12 @@ lib/rvg/transformable.rb
 lib/rvg/deep_equal.rb
 lib/rvg/rvg.rb
 lib/rvg/stretchable.rb
-gem_extconf.rb
 README-Mac-OSX.txt
 post-clean.rb
-metaconfig.in
 post-install.rb
+build_tarball.rake
 ChangeLog
 rmagick.gemspec
 uninstall.rb
-Makefile.in
+metaconfig
 README.html
-configure.ac
-configure

data/ext/RMagick/extconf.rb

@@ -0,0 +1,242 @@
+require "mkmf"
+require "date"
+
+RMAGICK_VERS = "2.0.0"
+MIN_RUBY_VERS = "1.8.2"
+MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
+MIN_IM_VERS = "6.3.0"
+MIN_IM_VERS_NO = MIN_IM_VERS.tr(".","").to_i
+
+SUMMARY = <<"END_SUMMARY"
+
+
+#{"=" * 70}
+#{DateTime.now.strftime("%a %d%b%y %T")}
+This installation of RMagick #{RMAGICK_VERS} is configured
+for Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{`Magick-config --version`.chomp}.
+#{"=" * 70}
+
+
+END_SUMMARY
+
+
+
+
+# Test for a specific value in an enum type
+def have_enum_value(enum, value, headers=nil, &b)
+  checking_for "#{enum}.#{value}" do
+    if try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+int main() { #{enum} t = #{value}; t = t; return 0; }
+SRC
+      $defs.push(format("-DHAVE_ENUM_%s", value.upcase))
+      true
+    else
+      false
+    end
+  end
+end
+
+
+
+
+def have_new_rb_cvar_set(headers=nil, &b)
+  checking_for "rb_cvar_set with 3 arguments" do
+    if try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+int main() { rb_cvar_set(rb_cArray, rb_intern("x"), INT2FIX(0)); return 0; }
+SRC
+      $defs.push("-DHAVE_NEW_RB_CVAR_SET")
+      true
+    else
+      false
+    end
+  end
+end
+
+
+
+
+# Test for multiple values of the same enum type
+def have_enum_values(enum, values, headers=nil, &b)
+  values.each do |value|
+    have_enum_value(enum, value, headers, &b)
+  end
+end
+
+
+
+
+def exit_failure(msg)
+  Logging::message msg
+  message msg+"\n"
+  exit(1)
+end
+
+
+
+
+unless checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
+  version = RUBY_VERSION.tr(".","").to_i
+  version >= MIN_RUBY_VERS_NO
+end
+  exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n"
+end
+
+
+# Check for Magick-config
+unless find_executable("Magick-config")
+  exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config in #{ENV['PATH']}\n"
+end
+
+
+# Ensure minimum ImageMagick version
+unless checking_for("ImageMagick version >= #{MIN_IM_VERS}")  do
+  version = `Magick-config --version`.chomp.tr(".","").to_i
+  version >= MIN_IM_VERS_NO
+end
+  exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
+end
+
+# Ensure ImageMagick is not configured for HDRI
+unless checking_for("HDRI disabled version of ImageMagick") do
+  not (`Magick-config --version`["HDRI"])
+end
+  exit_failure "\nCan't install RMagick #{RMAGICK_VERS}."+
+               "\nRMagick does not work when ImageMagick is configured for High Dynamic Range Images."+
+               "\nDon't use the --enable-hdri option when configuring ImageMagick.\n"
+end
+
+# Save flags
+$CFLAGS = ENV["CFLAGS"].to_s + " " + `Magick-config --cflags`.chomp
+$CPPFLAGS = `Magick-config --cppflags`.chomp
+$LDFLAGS = `Magick-config --ldflags`.chomp
+$LOCAL_LIBS = `Magick-config --libs`.chomp
+
+#headers = %w{assert.h ctype.h errno.h float.h limits.h math.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h}
+headers = %w{assert.h ctype.h stdint.h stdio.h stdlib.h math.h time.h}
+headers << "sys/types.h" if have_header("sys/types.h")
+
+
+unless have_header("magick/MagickCore.h")
+  exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find MagickCore.h.\n"
+else
+  headers << "magick/MagickCore.h"
+end
+
+unless have_library("Magick", "InitializeMagick", headers)
+  exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
+               "Can't find libMagick or one of the dependent libraries. " +
+               "Check the mkmf.log file for more detailed information.\n"
+end
+
+have_func("snprintf", headers)
+
+
+  ["AcquireQuantumMemory",           # 6.3.5-9
+   "ClutImageChannel",               # 6.3.5-8
+   "CompositeLayers",                # 6.3.3-?
+   "ConvertHSLToRGB",                # 6.3.5-9
+   "ConvertRGBToHSL",                # 6.3.5-9
+   "DistortImage",                   # 6.3.5
+   "EqualizeImageChannel",           # 6.3.6-9
+   "ExcerptImage",                   # 6.3.5-8
+   "ExtentImage",                    # 6.3.1
+   "GetImageProperty",               # 6.3.1
+   "GetNextImageProperty",           # 6.3.1
+   "IsHistogramImage",               # 6.3.5
+   "LinearStretchImage",             # 6.3.1
+   "MagickCoreGenesis",              # 6.3.4
+   "PolaroidImage",                  # 6.3.1-6
+   "RecolorImage",                   # 6.3.1-3
+   "ResetImagePage",                 # 6.3.3
+   "ResizeQuantumMemory",            # 6.3.5-9
+   "SetImageAlphaChannel",           # 6.3.6-9
+   "SetImageProperty",               # 6.3.1
+   "SetImageRegistry",               # 6.3.4-?
+   "SyncImageProfiles",              # 6.3.2
+   ].each do |func|
+    have_func(func, headers)
+  end
+
+
+have_type("AlphaChannelType", headers)  # 6.3.5
+have_type("ImageLayerMethod", headers)  # 6.3.6 replaces MagickLayerMethod
+have_type("long double", headers)
+have_type("unsigned long long", headers)
+have_type("uint64_t", headers)
+have_type("__int64", headers)
+check_sizeof("Image *", headers)
+
+
+have_enum_values("CompositeOperator", ["ChangeMaskCompositeOp",              # 6.3.3
+                                       "LinearLightCompositeOp",             # 6.3.5
+                                       "DivideCompositeOp"], headers)        # 6.3.5
+have_enum_values("DistortImageMethod", ["ArcDistortion",                     # 6.3.5-5
+                               "PerspectiveProjectionDistortion"], headers)  # 6.3.5-9
+have_enum_values("FilterTypes", ["KaiserFilter",                             # 6.3.6
+                                 "SentinelFilter",                           # 6.3.6
+                                 "WelshFilter",                              # 6.3.6-4
+                                 "ParzenFilter",                             # 6.3.6-4
+                                 "LagrangeFilter",                           # 6.3.7-2
+                                 "BohmanFilter",                             # 6.3.7-2
+                                 "BartlettFilter"], headers)                 # 6.3.7-2
+have_enum_value("InterpolatePixelMethod", "SplineInterpolatePixel", headers) # 6.3.5
+have_enum_values("InterlaceType", ["GIFInterlace",                           # 6.3.4
+                                  "JPEGInterlace",                           # 6.3.4
+                                  "PNGInterlace"], headers)                  # 6.3.4
+have_enum_values("MagickLayerMethod", ["OptimizeTransLayer",                 # 6.3.3-4
+                                       "RemoveDupsLayer",                    # 6.3.3-6
+                                       "RemoveZeroLayer",                    # 6.3.3-6
+                                       "CompositeLayer",                     # 6.3.3-6
+                                       "FlattenLayer",                       # 6.3.6-2
+                                       "MergeLayer",                         # 6.3.6
+                                       "MosaicLayer",                        # 6.3.6-2
+                                       "OptimizeImageLayer"], headers)       # 6.3.3-?
+have_enum_value("MetricType", "MeanErrorPerPixelMetric", headers)            # 6.3.4-?
+have_enum_value("NoiseType", "RandomNoise", headers)                         # 6.3.5-0
+have_enum_values("VirtualPixelMethod", ["MaskVirtualPixelMethod",            # 6.3.3
+                                        "BlackVirtualPixelMethod",           # 6.3.5
+                                        "GrayVirtualPixelMethod",            # 6.3.5
+                                        "WhiteVirtualPixelMethod"], headers) # 6.3.5
+
+
+# Now test Ruby 1.9.0 features. intern.h depends on stdarg.h.
+if have_header("stdarg.h")
+    $CPPFLAGS << " -DHAVE_STDARG_PROTOTYPES=1"
+end
+
+headers = ["ruby.h", "rubyio.h"]
+
+if have_header("intern.h")
+    headers << "intern.h"
+elsif have_header("ruby/intern.h")
+    headers << "ruby/intern.h"
+else
+    exit_failure "Can't find intern.h"
+end
+have_func("rb_frame_this_func", headers)
+have_new_rb_cvar_set(headers)
+
+
+
+# Miscellaneous constants
+$defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
+$defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
+
+create_header()
+# Prior to 1.8.5 mkmf duplicated the symbols on the command line and in the
+# extconf.h header. Suppress that behavior by removing the symbol array.
+$defs = []
+
+# Force re-compilation if the generated Makefile changed.
+$config_h = "Makefile rmagick.h"
+
+create_makefile("RMagick2")
+
+Logging::message SUMMARY
+message SUMMARY