rmagick 3.1.0 → 3.2.0

data/doc/ex/implode.rb

@@ -15,7 +15,7 @@ implosion = 0.25
 8.times do
   frames << img.implode(implosion)
   legend.annotate(frames, 0, 0, 10, 20, format('% 4.2f', implosion))
-  frames.matte = false
+  frames.alpha(Magick::DeactivateAlphaChannel)
   implosion -= 0.10
 end
 
@@ -23,7 +23,7 @@ end
   implosion += 0.10
   frames << img.implode(implosion)
   legend.annotate(frames, 0, 0, 10, 20, format('% 4.2f', implosion))
-  frames.matte = false
+  frames.alpha(Magick::DeactivateAlphaChannel)
 end
 
 frames.delay = 10

data/doc/ex/mask.rb

@@ -26,7 +26,7 @@ end
 # in the mask image. Assign the mask image to the mask= attribute of the image
 # being masked.
 
-q.matte = false
+q.alpha(Magick::DeactivateAlphaChannel)
 img.mask q
 
 # Use the #level method to darken the image under the black part of the mask.

data/doc/ex/matte_fill_to_border.rb

@@ -6,7 +6,7 @@ img = Magick::Image.new(200, 200)
 img.compression = Magick::LZWCompression
 
 bg = Magick::Image.read('plasma:fractal') { self.size = '200x200' }
-bg[0].matte = false
+bg[0].alpha(Magick::DeactivateAlphaChannel)
 
 gc = Magick::Draw.new
 gc.stroke_width(2)

data/doc/ex/matte_floodfill.rb

@@ -6,7 +6,7 @@ img = Magick::Image.new(200, 200)
 img.compression = Magick::LZWCompression
 
 bg = Magick::Image.read('plasma:fractal') { self.size = '200x200' }
-bg[0].matte = false
+bg[0].alpha(Magick::DeactivateAlphaChannel)
 
 gc = Magick::Draw.new
 gc.stroke_width(2)

data/doc/ex/matte_replace.rb

@@ -6,7 +6,7 @@ img = Magick::Image.new(200, 200)
 img.compression = Magick::LZWCompression
 
 bg = Magick::Image.read('plasma:fractal') { self.size = '200x200' }
-bg[0].matte = false
+bg[0].alpha(Magick::DeactivateAlphaChannel)
 
 gc = Magick::Draw.new
 gc.stroke_width(2)

data/doc/ex/stegano.rb

@@ -6,7 +6,7 @@ require 'rmagick'
 # Create a small watermark from the Snake image by
 # shrinking it and converting it to B&W.
 begin
-  watermark = Magick::Image.read('images/Snake.wmf').first
+  watermark = Magick::Image.read('images/Snake.png').first
   watermark.scale!(64.0 / watermark.rows)
   watermark = watermark.quantize(256, Magick::GRAYColorspace)
   wmrows = watermark.rows

data/examples/constitute.rb

@@ -4,4 +4,4 @@ require 'rmagick'
 f = Magick::Image.read('../doc/ex/images/Flower_Hat.jpg').first
 pixels = f.dispatch(0, 0, f.columns, f.rows, 'RGB')
 image = Magick::Image.constitute(f.columns, f.rows, 'RGB', pixels)
-image.write('constitute.miff')
+image.write('constitute.png')

data/examples/crop_with_gravity.rb

@@ -38,5 +38,5 @@ montage = pairs.montage do
   self.tile = '6x3'
   self.border_width = 1
 end
-montage.write('crop_with_gravity.miff')
+montage.write('crop_with_gravity.png')
 # montage.display

data/examples/demo.rb

@@ -261,7 +261,7 @@ begin
   puts '   wave...'
   temp = model.copy
   temp.cur_image[:Label] = 'Wave'
-  temp.matte = true
+  temp.alpha(Magick::ActivateAlphaChannel)
   temp.background_color = '#000000ff'
   example << temp.wave(25, 150)
 
@@ -309,9 +309,9 @@ begin
 
   # Write the result to a file
   montage_image.compression = RLECompression
-  montage_image.matte = false
-  puts 'Writing image ./rm_demo_out.miff'
-  montage_image.write 'rm_demo_out.miff'
+  montage_image.alpha(Magick::DeactivateAlphaChannel)
+  puts 'Writing image ./rm_demo_out.png'
+  montage_image.write 'rm_demo_out.png'
 
 # Uncomment the following lines to display image to screen
 # puts "Displaying image..."

data/examples/find_similar_region.rb

@@ -18,7 +18,7 @@ begin
     gc.fill('none')
     gc.rectangle(res[0], res[1], res[0] + target.columns, res[1] + target.rows)
     gc.draw(img)
-    img.matte = false
+    img.alpha(Magick::DeactivateAlphaChannel)
     puts "Found similar region. Writing `find_similar_region.gif'..."
     img.write('find_similar_region.gif')
   else

data/examples/histogram.rb

@@ -68,7 +68,7 @@ module Magick
       blue_histogram['Label'] = 'Blue'
       int_histogram = rgb_histogram.copy
       int_histogram['Label'] = 'Intensity'
-      int_histogram.matte = true
+      int_histogram.alpha(Magick::ActivateAlphaChannel)
 
       rgb_column   = PixelColumn.new(HISTOGRAM_ROWS)
       red_column   = PixelColumn.new(HISTOGRAM_ROWS)
@@ -291,7 +291,7 @@ image = image.first
 # Give the user something to look at while we're working.
 name = File.basename(filename).sub(/\..*?$/, '')
 $stdout.sync = true
-printf "Creating #{name}_Histogram.miff"
+printf "Creating #{name}_Histogram.png"
 
 timer = Thread.new do
   loop do
@@ -305,7 +305,7 @@ histogram = image.histogram(Magick::Pixel.from_color('white'), Magick::Pixel.fro
 
 # Write output file
 histogram.compression = Magick::ZipCompression
-histogram.write("./#{name}_Histogram.miff")
+histogram.write("./#{name}_Histogram.png")
 
 Thread.kill(timer)
 puts 'Done!'

data/examples/identify.rb

@@ -14,7 +14,7 @@ module Magick
       puts "\tEndianess: #{endian}\n"
       puts "\tColorspace: #{colorspace}\n"
       puts "\tChannelDepth:\n"
-      color_space = gray? ? Magick::GrayColorspace : colorspace
+      color_space = gray? ? Magick::GRAYColorspace : colorspace
       case color_space
       when Magick::RGBColorspace
         puts "\t\tRed: #{channel_depth(Magick::RedChannel)}-bits\n"
@@ -27,7 +27,7 @@ module Magick
         puts "\t\tYellow: #{channel_depth(Magick::YellowChannel)}-bits\n"
         puts "\t\tBlack: #{channel_depth(Magick::BlackChannel)}-bits\n"
         puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
-      when Magick::GrayColorspace
+      when Magick::GRAYColorspace
         puts "\t\tGray: #{channel_depth(Magick::GrayChannel)}-bits\n"
         puts "\t\tOpacity: #{channel_depth(Magick::OpacityChannel)}-bits\n" if matte
       end
@@ -36,54 +36,54 @@ module Magick
       case color_space
       when Magick::RGBColorspace
         puts "\t\tRed:\n"
-        puts "\t\t\tMin: " + format("%u (%g)\n", channel_extrema(Magick::RedChannel)[0] / scale, channel_extrema(Magick::RedChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::RedChannel)[1] / scale, channel_extrema(Magick::RedChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::RedChannel)[0] / scale, channel_mean(Magick::RedChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::RedChannel)[1] / scale, channel_mean(Magick::RedChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::GreenChannel)[0] / scale, channel_extrema(Magick::GreenChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::GreenChannel)[1] / scale, channel_extrema(Magick::GreenChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::GreenChannel)[0] / scale, channel_mean(Magick::GreenChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::GreenChannel)[1] / scale, channel_mean(Magick::GreenChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::BlueChannel)[0] / scale, channel_extrema(Magick::BlueChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::BlueChannel)[1] / scale, channel_extrema(Magick::BlueChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::BlueChannel)[0] / scale, channel_mean(Magick::BlueChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::BlueChannel)[1] / scale, channel_mean(Magick::BlueChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::CyanChannel)[0] / scale, channel_extrema(Magick::CyanChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::CyanChannel)[1] / scale, channel_extrema(Magick::CyanChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::CyanChannel)[0] / scale, channel_mean(Magick::CyanChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::CyanChannel)[1] / scale, channel_mean(Magick::CyanChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[0] / scale, channel_extrema(Magick::MagentaChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::MagentaChannel)[1] / scale, channel_extrema(Magick::MagentaChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::MagentaChannel)[0] / scale, channel_mean(Magick::MagentaChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::MagentaChannel)[1] / scale, channel_mean(Magick::MagentaChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::YellowChannel)[0] / scale, channel_extrema(Magick::YellowChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::YellowChannel)[1] / scale, channel_extrema(Magick::YellowChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::YellowChannel)[0] / scale, channel_mean(Magick::YellowChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::YellowChannel)[1] / scale, channel_mean(Magick::YellowChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::BlackChannel)[0] / scale, channel_extrema(Magick::BlackChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::BlackChannel)[1] / scale, channel_extrema(Magick::BlackChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::BlackChannel)[0] / scale, channel_mean(Magick::BlackChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::BlackChannel)[1] / scale, channel_mean(Magick::BlackChannel)[1] / Magick::QuantumRange)
-      when Magick::GrayColorspace
+        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: " + format("%u (%g)\n", channel_extrema(Magick::GrayChannel)[0] / scale, channel_extrema(Magick::GrayChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::GrayChannel)[1] / scale, channel_extrema(Magick::GrayChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean: " + format("%g (%g)\n", channel_mean(Magick::GrayChannel)[0] / scale, channel_mean(Magick::GrayChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation: " + format("%g (%g)\n", channel_mean(Magick::GrayChannel)[1] / scale, channel_mean(Magick::GrayChannel)[1] / Magick::QuantumRange)
+        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: " + format("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[0] / scale, channel_extrema(Magick::OpacityChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tMax: " + format("%u (%g)\n", channel_extrema(Magick::OpacityChannel)[1] / scale, channel_extrema(Magick::OpacityChannel)[1] / Magick::QuantumRange)
-        puts "\t\t\tMean:" + format("%u (%g)\n", channel_mean(Magick::OpacityChannel)[0] / scale, channel_mean(Magick::OpacityChannel)[0] / Magick::QuantumRange)
-        puts "\t\t\tStandard deviation:" + format("%u (%g)\n", channel_mean(Magick::OpacityChannel)[1] / scale, channel_mean(Magick::OpacityChannel)[1] / Magick::QuantumRange)
+        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"
@@ -101,20 +101,20 @@ module Magick
       chrom = chromaticity
       if chrom.red_primary.x != 0.0 || chrom.green_primary.x != 0.0 || chrom.blue_primary.x != 0.0 || chrom.white_point.x != 0.0
         puts "\tChromaticity:\n"
-        puts "\t\tred primary: (#{format('%g,%g', chrom.red_primary.x, chrom.red_primary.y)})\n"
-        puts "\t\tgreen primary: (#{format('%g,%g', chrom.green_primary.x, chrom.green_primary.y)})\n"
-        puts "\t\tblue primary: (#{format('%g,%g', chrom.blue_primary.x, chrom.blue_primary.y)})\n"
-        puts "\t\twhite point: (#{format('%g,%g', chrom.white_point.x, chrom.white_point.y)})\n"
+        puts "\t\tred primary: (#{sprintf('%g,%g', chrom.red_primary.x, chrom.red_primary.y)})\n"
+        puts "\t\tgreen primary: (#{sprintf('%g,%g', chrom.green_primary.x, chrom.green_primary.y)})\n"
+        puts "\t\tblue primary: (#{sprintf('%g,%g', chrom.blue_primary.x, chrom.blue_primary.y)})\n"
+        puts "\t\twhite point: (#{sprintf('%g,%g', chrom.white_point.x, chrom.white_point.y)})\n"
       end
       ex_info = extract_info
       puts "\tTile geometry: #{ex_info.width}x#{ex_info.height}+#{ex_info.x}+#{ex_info.y}\n" if ex_info.width * ex_info.height != 0.0
-      puts "\tResolution: #{format('%gx%g', x_resolution, y_resolution)}\n" if x_resolution != 0.0 && y_resolution != 0.0
+      puts "\tResolution: #{sprintf('%gx%g', x_resolution, y_resolution)}\n" if x_resolution != 0.0 && y_resolution != 0.0
       puts "\tUnits: #{units}\n"
       size = filesize
       if size >= 1_048_576
-        puts "\tFilesize: #{format('%.1f', (size / 1_048_576.0))}mb\n"
+        puts "\tFilesize: #{sprintf('%.1f', (size / 1_048_576.0))}mb\n"
       elsif size >= 1024
-        puts "\tFilesize: #{format('%.0f', (size / 1024.0))}kb\n"
+        puts "\tFilesize: #{sprintf('%.0f', (size / 1024.0))}kb\n"
       else
         puts "\tFilesize: #{size}b\n"
       end

data/examples/image_opacity.rb

@@ -23,6 +23,6 @@ end
 
 result = balloons.composite(legend, SouthGravity, OverCompositeOp)
 
-puts '...Writing image_opacity.miff'
-result.write 'image_opacity.miff'
+puts '...Writing image_opacity.png'
+result.write 'image_opacity.png'
 exit

data/examples/vignette.rb

@@ -51,8 +51,8 @@ oval = oval.blur_image(0, 20)
 # the oval remain opaque. Each gray pixel around the border of the oval has a
 # varying level of transparency depending on how dark or light it is.
 
-ballerina.matte = true  # Ensure the ballerina image's opacity channel is enabled.
-oval.matte = false      # Force the CopyOpacityCompositeOp to use pixel intensity
+ballerina.alpha(Magick::ActivateAlphaChannel)  # Ensure the ballerina image's opacity channel is enabled.
+oval.alpha(Magick::DeactivateAlphaChannel)     # Force the CopyOpacityCompositeOp to use pixel intensity
 # to determine how much transparency to add to the ballerina
 # pixels.
 
@@ -74,5 +74,5 @@ end
 
 checkerboard = Image.read('pattern:checkerboard') { self.size = "#{ballerina.columns}x#{ballerina.rows}" }
 vignette = checkerboard[0].composite(ballerina, CenterGravity, OverCompositeOp)
-vignette.display
+vignette.write('vignette.png')
 exit

data/ext/RMagick/extconf.rb

@@ -9,26 +9,30 @@ module RMagick
     require 'rmagick/version'
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
-    MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr('.', '').to_i
 
     attr_reader :headers
 
     def initialize
       @stdout = $stdout.dup
 
-      setup_paths_for_homebrew
+      setup_pkg_config_path
       configure_compile_options
       assert_can_compile!
       configure_headers
     end
 
-    def setup_paths_for_homebrew
-      return unless find_executable('brew')
+    def setup_pkg_config_path
+      if find_executable('brew')
+        pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
+      elsif find_executable('pacman')
+        pkg_config_path = '/usr/lib/imagemagick6/pkgconfig'
+      else
+        return
+      end
 
-      brew_pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
-      pkgconfig_paths = ENV['PKG_CONFIG_PATH'].to_s.split(':')
-      if File.exist?(brew_pkg_config_path) && !pkgconfig_paths.include?(brew_pkg_config_path)
-        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], brew_pkg_config_path].compact.join(':')
+      pkg_config_paths = ENV['PKG_CONFIG_PATH'].to_s.split(':')
+      if File.exist?(pkg_config_path) && !pkg_config_paths.include?(pkg_config_path)
+        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], pkg_config_path].compact.join(':')
       end
     end
 
@@ -45,8 +49,7 @@ module RMagick
     end
 
     def configure_headers
-      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h]
-      headers << 'sys/types.h' if have_header('sys/types.h')
+      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h]
 
       if have_header('magick/MagickCore.h')
         headers << 'magick/MagickCore.h'
@@ -98,7 +101,6 @@ module RMagick
         $LDFLAGS = %(-L"#{dir_paths[:lib]}")
 
         have_library('CORE_RL_magick_')
-        have_library('X11')
 
       else # mswin
 
@@ -111,9 +113,10 @@ module RMagick
         $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
 
         $LOCAL_LIBS = 'CORE_RL_magick_.lib'
-        have_library('X11')
 
       end
+
+      $CFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
     end
 
     # Test for a specific value in an enum type
@@ -285,8 +288,7 @@ END_MINGW
 
     def assert_minimum_ruby_version!
       unless checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
-        version = RUBY_VERSION.tr('.', '').to_i
-        version >= MIN_RUBY_VERS_NO
+        Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(MIN_RUBY_VERS)
       end
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n"
       end
@@ -303,7 +305,6 @@ END_MINGW
     end
 
     def create_header_file
-      have_func('snprintf', headers)
       [
         'GetImageChannelEntropy', # 6.9.0-0
         'SetImageGray' # 6.9.1-10
@@ -318,6 +319,9 @@ END_MINGW
       if Gem::Version.new($magick_version) >= Gem::Version.new('6.8.9')
         $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9=1')
       end
+      if Gem::Version.new($magick_version) >= Gem::Version.new('6.9.0')
+        $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0=1')
+      end
 
       create_header
     end

data/ext/RMagick/rmagick.c

@@ -179,14 +179,13 @@ MagickInfo_to_format(const MagickInfo *magick_info)
  * @see MagickInfo_to_format
  */
 VALUE
-Magick_init_formats(VALUE class)
+Magick_init_formats(VALUE class ATTRIBUTE_UNUSED)
 {
     const MagickInfo **magick_info;
     size_t number_formats, x;
     VALUE formats;
     ExceptionInfo *exception;
 
-    class = class;      // defeat "never referenced" message from icc
     formats = rb_hash_new();
 
     // IM 6.1.3 added an exception argument to GetMagickInfoList

data/ext/RMagick/rmagick.h

@@ -21,10 +21,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <math.h>
-#include <time.h>
-#if defined(HAVE_SYS_TYPES_H)
 #include <sys/types.h>
-#endif
 #include "ruby.h"
 #include "ruby/io.h"
 
@@ -52,6 +49,11 @@
 //! For quoting preprocessor symbols
 #define Q(q) Q2(q)
 
+#ifdef __GNUC__
+#define ATTRIBUTE_UNUSED  __attribute__((unused))
+#else
+#define ATTRIBUTE_UNUSED
+#endif
 
 //! Trace new image creation in bang methods
 #define UPDATE_DATA_PTR(_obj_, _new_) \
@@ -117,6 +119,12 @@ typedef ImageInfo Info; /**< Make type name match class name */
 typedef PixelPacket Pixel; /**< Make type name match class name */
 typedef MagickPixelPacket MagickPixel;
 typedef PixelPacket PixelColor;
+typedef AlphaChannelType AlphaChannelOption;
+typedef DistortImageMethod DistortMethod;
+typedef FilterTypes FilterType;
+typedef InterpolatePixelMethod PixelInterpolateMethod;
+typedef ImageLayerMethod LayerMethod;
+#define TransparentAlpha 0
 
 //! Montage
 typedef struct
@@ -286,7 +294,7 @@ EXTERN VALUE Class_QuantumExpressionOperator;
 // Enum classes
 EXTERN VALUE Class_Enum;
 EXTERN VALUE Class_AlignType;
-EXTERN VALUE Class_AlphaChannelType;
+EXTERN VALUE Class_AlphaChannelOption;
 EXTERN VALUE Class_AnchorType;
 EXTERN VALUE Class_ChannelType;
 EXTERN VALUE Class_ClassType;
@@ -296,19 +304,19 @@ EXTERN VALUE Class_CompositeOperator;
 EXTERN VALUE Class_CompressionType;
 EXTERN VALUE Class_DecorationType;
 EXTERN VALUE Class_DisposeType;
-EXTERN VALUE Class_DistortImageMethod;
+EXTERN VALUE Class_DistortMethod;
 EXTERN VALUE Class_DitherMethod;
 EXTERN VALUE Class_EndianType;
-EXTERN VALUE Class_FilterTypes;
+EXTERN VALUE Class_FilterType;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
-EXTERN VALUE Class_InterpolatePixelMethod;
-EXTERN VALUE Class_ImageLayerMethod;
+EXTERN VALUE Class_LayerMethod;
 EXTERN VALUE Class_MagickFunction;
 EXTERN VALUE Class_NoiseType;
 EXTERN VALUE Class_OrientationType;
 EXTERN VALUE Class_PaintMethod;
+EXTERN VALUE Class_PixelInterpolateMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
 EXTERN VALUE Class_ResolutionType;
@@ -430,6 +438,20 @@ EXTERN ID rm_ID_y;                 /**< "y" */
         rb_check_frozen(self);\
         Data_Get_Struct(self, class, ptr);\
         ptr->attr = R_##type##_to_C_##type(val);\
+        return val;\
+    }
+
+//! define attribute writer when attribute name is different from the field name
+#define DEF_ATTR_WRITERF(class, attr, field, type) \
+    VALUE class##_##attr##_eq(VALUE self, VALUE val)\
+    {\
+        class *ptr;\
+        if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
+            (void) rm_check_destroyed(self); \
+        }\
+        rb_check_frozen(self);\
+        Data_Get_Struct(self, class, ptr);\
+        ptr->field = R_##type##_to_C_##type(val);\
         return self;\
     }
 
@@ -438,6 +460,11 @@ EXTERN ID rm_ID_y;                 /**< "y" */
     DEF_ATTR_READER(class, attr, type)\
     DEF_ATTR_WRITER(class, attr, type)
 
+//! define attribute accessor when attribute name is different from the field name
+#define DEF_ATTR_ACCESSORF(class, attr, field, type)\
+    DEF_ATTR_READERF(class, attr, field, type)\
+    DEF_ATTR_WRITERF(class, attr, field, type)
+
 /*
  *  Declare attribute accessors
  */
@@ -456,8 +483,10 @@ EXTERN ID rm_ID_y;                 /**< "y" */
 //!  Define a Magick module constant
 #if MAGICKCORE_QUANTUM_DEPTH == 64
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, ULL2NUM(constant))
+#define DEF_CONSTV(constant, val) rb_define_const(Module_Magick, #constant, ULL2NUM(val))
 #else   // MAGICKCORE_QUANTUM_DEPTH == 8, 16, 32
 #define DEF_CONST(constant) rb_define_const(Module_Magick, #constant, UINT2NUM(constant))
+#define DEF_CONSTV(constant, val) rb_define_const(Module_Magick, #constant, UINT2NUM(val))
 #endif
 
 
@@ -573,6 +602,7 @@ extern VALUE ImageList_animate(int, VALUE *, VALUE);
 extern VALUE ImageList_append(VALUE, VALUE);
 extern VALUE ImageList_average(VALUE);
 extern VALUE ImageList_coalesce(VALUE);
+extern VALUE ImageList_combine(int, VALUE *, VALUE);
 extern VALUE ImageList_composite_layers(int, VALUE *, VALUE);
 extern VALUE ImageList_deconstruct(VALUE);
 extern VALUE ImageList_display(VALUE);
@@ -627,7 +657,6 @@ ATTR_ACCESSOR(Info, orientation)
 ATTR_ACCESSOR(Info, origin)
 ATTR_ACCESSOR(Info, page)
 ATTR_ACCESSOR(Info, pen)
-// ATTR_ACCESSOR(Info, ping) obsolete
 ATTR_ACCESSOR(Info, pointsize)
 ATTR_ACCESSOR(Info, quality)
 ATTR_ACCESSOR(Info, sampling_factor)
@@ -642,7 +671,6 @@ ATTR_ACCESSOR(Info, transparent_color)
 ATTR_ACCESSOR(Info, undercolor)
 ATTR_ACCESSOR(Info, units)
 ATTR_ACCESSOR(Info, view)
-//ATTR_ACCESSOR(Info, verbose)
 
 extern VALUE Info_alloc(VALUE);
 
@@ -875,7 +903,7 @@ extern VALUE Image_map(int, VALUE *, VALUE);
 extern VALUE Image_marshal_dump(VALUE);
 extern VALUE Image_marshal_load(VALUE, VALUE);
 extern VALUE Image_mask(int, VALUE *, VALUE);
-extern VALUE Image_matte_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+extern VALUE Image_matte_flood_fill(int, VALUE *, VALUE);
 extern VALUE Image_median_filter(int, VALUE *, VALUE);
 extern VALUE Image_minify(VALUE);
 extern VALUE Image_minify_bang(VALUE);
@@ -995,6 +1023,7 @@ extern VALUE  TextureFill_fill(VALUE, VALUE);
 ATTR_ACCESSOR(Pixel, red)
 ATTR_ACCESSOR(Pixel, green)
 ATTR_ACCESSOR(Pixel, blue)
+ATTR_ACCESSOR(Pixel, alpha)
 ATTR_ACCESSOR(Pixel, opacity)
 ATTR_ACCESSOR(Pixel, cyan)
 ATTR_ACCESSOR(Pixel, magenta)
@@ -1032,31 +1061,31 @@ extern VALUE  Enum_spaceship(VALUE, VALUE);
 extern VALUE  Enum_bitwise_or(VALUE, VALUE);
 extern VALUE  Enum_case_eq(VALUE, VALUE);
 extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
+extern VALUE  Enum_find(VALUE class, int val);
 extern VALUE  Enum_type_each(VALUE);
 extern VALUE  rm_enum_new(VALUE, VALUE, VALUE);
-extern VALUE  ClassType_new(ClassType);
-extern VALUE  ColorspaceType_new(ColorspaceType);
+extern VALUE  ClassType_find(ClassType);
+extern VALUE  ColorspaceType_find(ColorspaceType);
 extern const char *ComplianceType_name(ComplianceType *);
-extern VALUE  ComplianceType_new(ComplianceType);
-extern VALUE  CompositeOperator_new(CompositeOperator);
-extern VALUE  CompressionType_new(CompressionType);
-extern VALUE  DisposeType_new(DisposeType);
-extern VALUE  EndianType_new(EndianType);
-extern VALUE  FilterTypes_new(FilterTypes);
-extern VALUE  GravityType_new(GravityType);
-extern VALUE  ImageLayerMethod_new(ImageLayerMethod);
-extern VALUE  ImageType_new(ImageType);
-extern VALUE  InterlaceType_new(InterlaceType);
-extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
-extern VALUE  OrientationType_new(OrientationType);
-extern VALUE  RenderingIntent_new(RenderingIntent);
-extern VALUE  ResolutionType_new(ResolutionType);
+extern VALUE  ComplianceType_find(ComplianceType);
+extern VALUE  CompositeOperator_find(CompositeOperator);
+extern VALUE  CompressionType_find(CompressionType);
+extern VALUE  DisposeType_find(DisposeType);
+extern VALUE  EndianType_find(EndianType);
+extern VALUE  FilterType_find(FilterType);
+extern VALUE  GravityType_find(GravityType);
+extern VALUE  ImageType_find(ImageType);
+extern VALUE  InterlaceType_find(InterlaceType);
+extern VALUE  OrientationType_find(OrientationType);
+extern VALUE  PixelInterpolateMethod_find(PixelInterpolateMethod);
+extern VALUE  RenderingIntent_find(RenderingIntent);
+extern VALUE  ResolutionType_find(ResolutionType);
 extern const char *StorageType_name(StorageType);
-extern VALUE  StretchType_new(StretchType);
+extern VALUE  StretchType_find(StretchType);
 extern const char *StretchType_name(StretchType);
-extern VALUE  StyleType_new(StyleType);
+extern VALUE  StyleType_find(StyleType);
 extern const char *StyleType_name(StyleType);
-extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
+extern VALUE  VirtualPixelMethod_find(VirtualPixelMethod);
 
 
 // rmstruct.c