rmagick 2.16.0 → 3.0.0

data/doc/ex/tspan03.rb

@@ -2,18 +2,18 @@ require 'rvg/rvg'
 
 Magick::RVG.dpi = 90
 
-rvg = Magick::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|
-    grp.text.styles(:font_family=>'Verdana', :font_size=>45) do |txt|
+    grp.text.styles(font_family: 'Verdana', font_size: 45) do |txt|
       txt.tspan('Rotation')
-      txt.tspan(' propogates').rotate(20).styles(:fill=>'red') do |tsp|
-        tsp.tspan(' to descendents').styles(:fill=>'green')
+      txt.tspan(' propogates').rotate(20).styles(fill: 'red') do |tsp|
+        tsp.tspan(' to descendents').styles(fill: 'green')
       end
     end
   end
-  canvas.rect(997, 297).styles(:fill=>'none', :stroke=>'blue')
+  canvas.rect(997, 297).styles(fill: 'none', stroke: 'blue')
 end
 
 rvg.draw.write('tspan03.gif')

data/doc/ex/unsharp_mask.rb

@@ -11,18 +11,18 @@ img.resize!(3)
 eimg.resize!(3)
 
 # Make a before-and-after composite
-eimg.crop!(eimg.columns/2, 0, eimg.columns/2, eimg.rows)
+eimg.crop!(eimg.columns / 2, 0, eimg.columns / 2, eimg.rows)
 img = img.composite(eimg, Magick::EastGravity, Magick::OverCompositeOp)
 
 # Draw a black line between the before and after parts.
 line = Magick::Draw.new
-line.line(img.columns/2, 0, img.columns/2, img.rows)
+line.line(img.columns / 2, 0, img.columns / 2, img.rows)
 line.draw(img)
 
 # Zoom in so we can see the change,
 # then crop everything but the face.
 img.crop!(Magick::CenterGravity, 250, 200)
 
-#img.display
+# img.display
 img.write('unsharp_mask.jpg')
 exit

data/doc/ex/viewex.rb

@@ -2,7 +2,7 @@
 
 require 'rmagick'
 
-img = Magick::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.
@@ -12,21 +12,21 @@ img.view(10, 5, 20, 20) do |view|
 
   # Change the top and bottom rows to red.
   view[0][] = 'red'
-  view[-1,1][] = 'red'
+  view[-1, 1][] = 'red'
 
   # Set 6 pixels to black.
-  view[[13,15]][[12,14,16]] = 'black'
+  view[[13, 15]][[12, 14, 16]] = 'black'
 
   # Set 1 pixel to yellow.
   view[5][7] = 'yellow'
 
   # Change the green channel of all the
   # pixels on row 8.
-  view[8][].green = Magick::QuantumRange/2
+  view[8][].green = Magick::QuantumRange / 2
 
   # Change the blue channel of 8 pixels
   # on column 10.
-  view[4,8][10].blue = Magick::QuantumRange
+  view[4, 8][10].blue = Magick::QuantumRange
 end
 
 img.scale(5).write('viewex.gif')

data/doc/ex/watermark.rb

@@ -5,17 +5,17 @@ require 'rmagick'
 img = Magick::Image.read('images/Flower_Hat.jpg').first
 
 # Make a watermark from the word "RMagick"
-mark = Magick::Image.new(140, 40) {self.background_color = 'none'}
+mark = Magick::Image.new(140, 40) { self.background_color = 'none' }
 gc = Magick::Draw.new
 
 gc.annotate(mark, 0, 0, 0, -5, 'RMagick') do
   gc.gravity = Magick::CenterGravity
   gc.pointsize = 32
-  if RUBY_PLATFORM =~ /mswin32/
-    gc.font_family = 'Georgia'
-  else
-    gc.font_family = 'Times'
-  end
+  gc.font_family = if RUBY_PLATFORM =~ /mswin32/
+                     'Georgia'
+                   else
+                     'Times'
+                   end
   gc.fill = 'white'
   gc.stroke = 'none'
 end

data/doc/ex/wet_floor.rb

@@ -4,7 +4,7 @@ require 'rmagick'
 
 results = Magick::ImageList.new
 
-img = Magick::Image.new(270, 60) {self.background_color = 'black' }
+img = Magick::Image.new(270, 60) { self.background_color = 'black' }
 
 gc = Magick::Draw.new
 gc.annotate(img, 0, 0, 0, -15, 'RUBY!') do
@@ -40,7 +40,7 @@ ilist[1] = img.wet_floor(0.25, 0.5)
 results << ilist.append(true)
 
 # Add a slant
-xform = Magick::AffineMatrix.new(1.0, 0.0, Math::PI/4.0, 1.0, 0.0, 0.0)
+xform = Magick::AffineMatrix.new(1.0, 0.0, Math::PI / 4.0, 1.0, 0.0, 0.0)
 ilist[1] = ilist[1].affine_transform(xform)
 results << ilist.append(true)
 

data/doc/ex/writing_mode01.rb

@@ -2,25 +2,25 @@ require 'rvg/rvg'
 
 Magick::RVG.dpi = 90
 
-TEXT_STYLES = {:writing_mode=>'tb',
-               :glyph_orientation_vertical=>0,
-               :fill=>'red4',
-               :font_weight=>'bold',
-               :font_size=>16}
+TEXT_STYLES = { writing_mode: 'tb',
+                glyph_orientation_vertical: 0,
+                fill: 'red4',
+                font_weight: 'bold',
+                font_size: 16 }
 
-TEXT_STYLES2 = {:writing_mode=>'tb',
-                :glyph_orientation_vertical=>90,
-                :fill=>'green',
-                :font_weight=>'bold',
-                :font_size=>16}
+TEXT_STYLES2 = { writing_mode: 'tb',
+                 glyph_orientation_vertical: 90,
+                 fill: 'green',
+                 font_weight: 'bold',
+                 font_size: 16 }
 
-rvg = Magick::RVG.new(1.25.in, 7.in).viewbox(0,0,125,700) do |canvas|
+rvg = Magick::RVG.new(1.25.in, 7.in).viewbox(0, 0, 125, 700) do |canvas|
   canvas.background_fill = 'white'
 
   canvas.text(40, 15, ':glyph_orientation_vertical=0').styles(TEXT_STYLES)
   canvas.text(80, 25, ':glyph_orientation_vertical=90').styles(TEXT_STYLES2)
 
-  canvas.rect(124, 698).styles(:fill=>'none',:stroke=>'blue')
+  canvas.rect(124, 698).styles(fill: 'none', stroke: 'blue')
 end
 
 rvg.draw.write('writing_mode01.gif')

data/doc/ex/writing_mode02.rb

@@ -2,25 +2,25 @@ require 'rvg/rvg'
 
 Magick::RVG.dpi = 90
 
-TEXT_STYLES = {:writing_mode=>'lr',
-               :glyph_orientation_horizontal=>0,
-               :fill=>'red4',
-               :font_weight=>'bold',
-               :font_size=>16}
+TEXT_STYLES = { writing_mode: 'lr',
+                glyph_orientation_horizontal: 0,
+                fill: 'red4',
+                font_weight: 'bold',
+                font_size: 16 }
 
-TEXT_STYLES2 = {:writing_mode=>'lr',
-                :glyph_orientation_horizontal=>180,
-                :fill=>'green',
-                :font_weight=>'bold',
-                :font_size=>16}
+TEXT_STYLES2 = { writing_mode: 'lr',
+                 glyph_orientation_horizontal: 180,
+                 fill: 'green',
+                 font_weight: 'bold',
+                 font_size: 16 }
 
-rvg = Magick::RVG.new(3.in, 1.in).viewbox(0,0,300,100) do |canvas|
+rvg = Magick::RVG.new(3.in, 1.in).viewbox(0, 0, 300, 100) do |canvas|
   canvas.background_fill = 'white'
 
   canvas.text(15, 40, ':glyph_orientation_horizontal=0').styles(TEXT_STYLES)
   canvas.text(15, 80, ':glyph_orientation_horizontal=180').styles(TEXT_STYLES2)
 
-  canvas.rect(299, 99).styles(:fill=>'none',:stroke=>'blue')
+  canvas.rect(299, 99).styles(fill: 'none', stroke: 'blue')
 end
 
 rvg.draw.write('writing_mode02.gif')

data/examples/constitute.rb

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

data/examples/crop_with_gravity.rb

@@ -12,13 +12,13 @@ include Magick
 
 shorts = Image.read('../doc/ex/images/Shorts.jpg').first
 
-regwidth = shorts.columns/2
-regheight = shorts.rows/2
+regwidth = shorts.columns / 2
+regheight = shorts.rows / 2
 
-mask = Image.new(regwidth, regheight) { self.background_color = 'white'}
+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'}
+black = Image.new(shorts.columns, shorts.rows) { self.background_color = 'black' }
 pairs = ImageList.new
 
 [NorthWestGravity, NorthGravity, NorthEastGravity,
@@ -39,4 +39,4 @@ montage = pairs.montage do
   self.border_width = 1
 end
 montage.write('crop_with_gravity.miff')
-#montage.display
+# montage.display

data/examples/demo.rb

@@ -37,7 +37,7 @@ begin
   # optional "size" attribute in the parm block associated with
   # the read method. There are two more examples of this, below.
   example = ImageList.new
-  5.times { example.read('NULL:black') { self.size = '70x70'} }
+  5.times { example.read('NULL:black') { self.size = '70x70' } }
 
   puts '   add noise...'
   example << model.add_noise(LaplacianNoise)
@@ -80,7 +80,7 @@ begin
   example.cur_image[:Label] = 'Contrast'
 
   puts '   convolve...'
-  kernel = [ 1, 1, 1, 1, 4, 1, 1, 1, 1 ]
+  kernel = [1, 1, 1, 1, 4, 1, 1, 1, 1]
   example << model.convolve(3, kernel)
   example.cur_image[:Label] = 'Convolve'
 
@@ -100,7 +100,7 @@ begin
   gc.fill_opacity 0
   gc.stroke 'gold'
   gc.stroke_width 2
-  gc.circle 60,90, 60,120
+  gc.circle 60, 90, 60, 120
   gc.draw(example)
 
   puts '   edge...'
@@ -277,7 +277,7 @@ begin
     self.gravity = CenterGravity
     self.border_width = 1
     rows = (example.size + 4) / 5
-    self.tile = Geometry.new(5,rows)
+    self.tile = Geometry.new(5, rows)
     self.compose = OverCompositeOp
 
     # Use the ImageMagick built-in "granite" format
@@ -298,7 +298,7 @@ begin
   puts 'Adding logo image...'
   logo = Image.read('logo:').first
   if /GraphicsMagick/.match Magick_version
-    logo.resize!(200.0/logo.rows)
+    logo.resize!(200.0 / logo.rows)
   else
     logo.crop!(98, 0, 461, 455).resize!(0.45)
   end
@@ -316,8 +316,7 @@ begin
 # Uncomment the following lines to display image to screen
 # puts "Displaying image..."
 # montage_image.display
-
-rescue
+rescue StandardError
   puts "Caught exception: #{$ERROR_INFO}"
 end
 

data/examples/describe.rb

@@ -1,4 +1,3 @@
-
 # Purpose: Demonstrate getting information from the image attributes.
 # Usage: describe.rb filename1 [filename2...]
 # Notes: The output is similar to ImageMagick's identify command.
@@ -11,7 +10,7 @@ This example shows how to extract attributes from an image.
 
 END_INFO
 
-if ARGV.length == 0
+if ARGV.length.zero?
   puts 'Specify one or more image filenames as arguments.'
   exit
 end
@@ -31,13 +30,12 @@ ARGV.each do |file|
   puts "   Colors: #{img.number_colors}"
   puts "   Filesize: #{img.filesize}"
   puts "   Resolution: #{img.x_resolution.to_i}x#{img.y_resolution.to_i} "\
-       "pixels/#{img.units == Magick::PixelsPerInchResolution ?
-       'inch' : 'centimeter'}"
-
-  if img.properties.length > 0
-    puts '   Properties:'
-    img.properties do |name,value|
-      puts %Q|      #{name} = "#{value}"|
-    end
+       "pixels/#{img.units == Magick::PixelsPerInchResolution ? 'inch' : 'centimeter'}"
+
+  next if img.properties.empty?
+
+  puts '   Properties:'
+  img.properties do |name, value|
+    puts %(      #{name} = "#{value}")
   end
 end

data/examples/find_similar_region.rb

@@ -16,7 +16,7 @@ begin
     gc.stroke('red')
     gc.stroke_width(2)
     gc.fill('none')
-    gc.rectangle(res[0], res[1], res[0]+target.columns, res[1]+target.rows)
+    gc.rectangle(res[0], res[1], res[0] + target.columns, res[1] + target.rows)
     gc.draw(img)
     img.matte = false
     puts "Found similar region. Writing `find_similar_region.gif'..."
@@ -25,10 +25,10 @@ begin
     puts 'No match!'
   end
 rescue NotImplementedError
-  $stderr.puts <<-END_MSG
+  warn <<-END_MSG
     The find_similar_region method is not supported by this version of
     ImageMagick/GraphicsMagick.
-    END_MSG
+  END_MSG
 end
 
 exit

data/examples/histogram.rb

@@ -7,11 +7,11 @@ require 'rmagick'
 class PixelColumn < Array
   def initialize(size)
     super
-    fill {Magick::Pixel.new}
+    fill { Magick::Pixel.new }
   end
 
   def reset(bg)
-    each {|pixel| pixel.reset(bg)}
+    each { |pixel| pixel.reset(bg) }
   end
 end
 
@@ -28,250 +28,243 @@ module Magick
   class Image
     private
 
-      HISTOGRAM_COLS = 256
-      HISTOGRAM_ROWS = 200
-      MAX_QUANTUM = 255
-      AIR_FACTOR = 1.025
+    HISTOGRAM_COLS = 256
+    HISTOGRAM_ROWS = 200
+    MAX_QUANTUM = 255
+    AIR_FACTOR = 1.025
 
-      # The alpha frequencies are shown as white dots.
-      def alpha_hist(freqs, scale, fg, bg)
-        histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
-          self.background_color = bg
-          self.border_color = fg
-        end
+    # The alpha frequencies are shown as white dots.
+    def alpha_hist(freqs, scale, fg, bg)
+      histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
+        self.background_color = bg
+        self.border_color = fg
+      end
 
-        gc = Draw.new
-        gc.affine(1, 0, 0, -scale, 0, HISTOGRAM_ROWS)
-        gc.fill('white')
+      gc = Draw.new
+      gc.affine(1, 0, 0, -scale, 0, HISTOGRAM_ROWS)
+      gc.fill('white')
 
-        HISTOGRAM_COLS.times do |x|
-          gc.point(x, freqs[x])
-        end
+      HISTOGRAM_COLS.times do |x|
+        gc.point(x, freqs[x])
+      end
 
-        gc.draw(histogram)
-        histogram['Label'] = 'Alpha'
+      gc.draw(histogram)
+      histogram['Label'] = 'Alpha'
 
-        histogram
-      end
+      histogram
+    end
 
-      def channel_histograms(red, green, blue, int, scale, fg, bg)
-        rgb_histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
-          self.background_color = bg
-          self.border_color = fg
-        end
-        rgb_histogram['Label'] = 'RGB'
-        red_histogram   = rgb_histogram.copy
-        red_histogram['Label'] = 'Red'
-        green_histogram = rgb_histogram.copy
-        green_histogram['Label'] = 'Green'
-        blue_histogram  = rgb_histogram.copy
-        blue_histogram['Label'] = 'Blue'
-        int_histogram = rgb_histogram.copy
-        int_histogram['Label'] = 'Intensity'
-        int_histogram.matte = true
-
-        rgb_column   = PixelColumn.new(HISTOGRAM_ROWS)
-        red_column   = PixelColumn.new(HISTOGRAM_ROWS)
-        green_column = PixelColumn.new(HISTOGRAM_ROWS)
-        blue_column  = PixelColumn.new(HISTOGRAM_ROWS)
-        int_column   = PixelColumn.new(HISTOGRAM_ROWS)
-
-        HISTOGRAM_COLS.times do |x|
-          HISTOGRAM_ROWS.times do |y|
-            yf = Float(y)
-            if yf >= HISTOGRAM_ROWS - (red[x] * scale)
-              red_column[y].red = QuantumRange
-              red_column[y].green = 0
-              red_column[y].blue = 0
-              rgb_column[y].red = QuantumRange
-            end
-            if yf >= HISTOGRAM_ROWS - (green[x] * scale)
-              green_column[y].green = QuantumRange
-              green_column[y].red = 0
-              green_column[y].blue = 0
-              rgb_column[y].green = QuantumRange
-            end
-            if yf >= HISTOGRAM_ROWS - (blue[x] * scale)
-              blue_column[y].blue = QuantumRange
-              blue_column[y].red = 0
-              blue_column[y].green = 0
-              rgb_column[y].blue = QuantumRange
-            end
-            if yf >= HISTOGRAM_ROWS - (int[x] * scale)
-              int_column[y].opacity = TransparentOpacity
-            end
+    def channel_histograms(red, green, blue, int, scale, fg, bg)
+      rgb_histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
+        self.background_color = bg
+        self.border_color = fg
+      end
+      rgb_histogram['Label'] = 'RGB'
+      red_histogram = rgb_histogram.copy
+      red_histogram['Label'] = 'Red'
+      green_histogram = rgb_histogram.copy
+      green_histogram['Label'] = 'Green'
+      blue_histogram = rgb_histogram.copy
+      blue_histogram['Label'] = 'Blue'
+      int_histogram = rgb_histogram.copy
+      int_histogram['Label'] = 'Intensity'
+      int_histogram.matte = true
+
+      rgb_column   = PixelColumn.new(HISTOGRAM_ROWS)
+      red_column   = PixelColumn.new(HISTOGRAM_ROWS)
+      green_column = PixelColumn.new(HISTOGRAM_ROWS)
+      blue_column  = PixelColumn.new(HISTOGRAM_ROWS)
+      int_column   = PixelColumn.new(HISTOGRAM_ROWS)
+
+      HISTOGRAM_COLS.times do |x|
+        HISTOGRAM_ROWS.times do |y|
+          yf = Float(y)
+          if yf >= HISTOGRAM_ROWS - (red[x] * scale)
+            red_column[y].red = QuantumRange
+            red_column[y].green = 0
+            red_column[y].blue = 0
+            rgb_column[y].red = QuantumRange
           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)
-          blue_histogram.store_pixels( x, 0, 1, HISTOGRAM_ROWS, blue_column)
-          int_histogram.store_pixels(  x, 0, 1, HISTOGRAM_ROWS, int_column)
-          rgb_column.reset(bg)
-          red_column.reset(bg)
-          green_column.reset(bg)
-          blue_column.reset(bg)
-          int_column.reset(bg)
+          if yf >= HISTOGRAM_ROWS - (green[x] * scale)
+            green_column[y].green = QuantumRange
+            green_column[y].red = 0
+            green_column[y].blue = 0
+            rgb_column[y].green = QuantumRange
+          end
+          if yf >= HISTOGRAM_ROWS - (blue[x] * scale)
+            blue_column[y].blue = QuantumRange
+            blue_column[y].red = 0
+            blue_column[y].green = 0
+            rgb_column[y].blue = QuantumRange
+          end
+          int_column[y].opacity = TransparentOpacity if yf >= HISTOGRAM_ROWS - (int[x] * scale)
         end
 
-        [red_histogram, green_histogram, blue_histogram, rgb_histogram, int_histogram]
+        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)
+        blue_histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, blue_column)
+        int_histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, int_column)
+        rgb_column.reset(bg)
+        red_column.reset(bg)
+        green_column.reset(bg)
+        blue_column.reset(bg)
+        int_column.reset(bg)
       end
 
-      # Make the color histogram. Quantize the image to 256 colors if necessary.
-      def color_hist(fg, bg)
-        img = number_colors > 256 ? quantize(256) : self
+      [red_histogram, green_histogram, blue_histogram, rgb_histogram, int_histogram]
+    end
 
-        begin
-          hist = img.color_histogram
+    # Make the color histogram. Quantize the image to 256 colors if necessary.
+    def color_hist(fg, bg)
+      img = number_colors > 256 ? quantize(256) : self
+
+      begin
+        hist = img.color_histogram
       rescue NotImplementedError
-        $stderr.puts 'The color_histogram method is not supported by this version '\
+        warn 'The color_histogram method is not supported by this version '\
                      'of ImageMagick/GraphicsMagick'
+      else
+        pixels = hist.keys.sort_by { |pixel| hist[pixel] }
+        scale = HISTOGRAM_ROWS / (hist.values.max * AIR_FACTOR)
 
-        else
-          pixels = hist.keys.sort_by {|pixel| hist[pixel] }
-          scale = HISTOGRAM_ROWS / (hist.values.max*AIR_FACTOR)
-
-          histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
-                self.background_color = bg
-                self.border_color = fg
-              end
-
-          x = 0
-          pixels.each do |pixel|
-            column = Array.new(HISTOGRAM_ROWS).fill {Pixel.new}
-            HISTOGRAM_ROWS.times do |y|
-              if y >= HISTOGRAM_ROWS - (hist[pixel] * scale)
-                column[y] = pixel
-              end
-            end
-            histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, column)
-            x = x.succ
-          end
+        histogram = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
+          self.background_color = bg
+          self.border_color = fg
+        end
 
-          histogram['Label'] = 'Color Frequency'
-          return histogram
+        x = 0
+        pixels.each do |pixel|
+          column = Array.new(HISTOGRAM_ROWS).fill { Pixel.new }
+          HISTOGRAM_ROWS.times do |y|
+            column[y] = pixel if y >= HISTOGRAM_ROWS - (hist[pixel] * scale)
+          end
+          histogram.store_pixels(x, 0, 1, HISTOGRAM_ROWS, column)
+          x = x.succ
         end
+
+        histogram['Label'] = 'Color Frequency'
+        return histogram
       end
+    end
 
-      # Use AnnotateImage to write the stats.
-      def info_text(fg, bg)
-        klass = class_type == DirectClass ? 'DirectClass' : 'PsuedoClass'
+    # Use AnnotateImage to write the stats.
+    def info_text(fg, bg)
+      klass = class_type == DirectClass ? 'DirectClass' : 'PsuedoClass'
 
-        text = <<-END_TEXT
+      text = <<-END_TEXT
 Format: #{format}
 Geometry: #{columns}x#{rows}
 Class: #{klass}
 Depth: #{depth} bits-per-pixel component
 Colors: #{number_colors}
-            END_TEXT
-
-        info = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
-              self.background_color = bg
-              self.border_color = fg
-            end
+      END_TEXT
 
-        gc = Draw.new
+      info = Image.new(HISTOGRAM_COLS, HISTOGRAM_ROWS) do
+        self.background_color = bg
+        self.border_color = fg
+      end
 
-        gc.annotate(info, 0, 0, 0, 0, text) do
-          self.stroke = 'transparent'
-          self.fill = fg
-          self.gravity = CenterGravity
-        end
-        info['Label'] = 'Info'
+      gc = Draw.new
 
-        info
+      gc.annotate(info, 0, 0, 0, 0, text) do
+        self.stroke = 'transparent'
+        self.fill = fg
+        self.gravity = CenterGravity
       end
+      info['Label'] = 'Info'
 
-      def intensity_hist(int_histogram)
-        gradient = (Image.read('gradient:#ffff80-#ff9000') { self.size="#{HISTOGRAM_COLS}x#{HISTOGRAM_ROWS}" }).first
-        int_histogram = gradient.composite(int_histogram, CenterGravity, OverCompositeOp)
+      info
+    end
 
-        int_histogram['Label'] = 'Intensity'
+    def intensity_hist(int_histogram)
+      gradient = (Image.read('gradient:#ffff80-#ff9000') { self.size = "#{HISTOGRAM_COLS}x#{HISTOGRAM_ROWS}" }).first
+      int_histogram = gradient.composite(int_histogram, CenterGravity, OverCompositeOp)
 
-        int_histogram
-      end
+      int_histogram['Label'] = 'Intensity'
 
-      # Returns a value between 0 and MAX_QUANTUM. Same as the PixelIntensity macro.
-      def pixel_intensity(pixel)
-        (306*(pixel.red & MAX_QUANTUM) + 601*(pixel.green & MAX_QUANTUM) + 117*(pixel.blue & MAX_QUANTUM))/1024
-      end
+      int_histogram
+    end
+
+    # Returns a value between 0 and MAX_QUANTUM. Same as the PixelIntensity macro.
+    def pixel_intensity(pixel)
+      (306 * (pixel.red & MAX_QUANTUM) + 601 * (pixel.green & MAX_QUANTUM) + 117 * (pixel.blue & MAX_QUANTUM)) / 1024
+    end
 
     public
 
-      # Create the histogram montage.
-      def histogram(fg='white', bg='black')
-        red   = Array.new(HISTOGRAM_COLS, 0)
-        green = Array.new(HISTOGRAM_COLS, 0)
-        blue  = Array.new(HISTOGRAM_COLS, 0)
-        alpha = Array.new(HISTOGRAM_COLS, 0)
-        int   = Array.new(HISTOGRAM_COLS, 0)
-
-        rows.times do |row|
-          pixels = get_pixels(0, row, columns, 1)
-          pixels.each do |pixel|
-            red[pixel.red & MAX_QUANTUM] += 1
-            green[pixel.green & MAX_QUANTUM] += 1
-            blue[pixel.blue & MAX_QUANTUM] += 1
-
-            # Only count opacity channel if some pixels are not opaque.
-            unless opaque?
-              alpha[pixel.opacity & MAX_QUANTUM] += 1
-            end
-            v = pixel_intensity(pixel)
-            int[v] += 1
-          end
+    # Create the histogram montage.
+    def histogram(fg = 'white', bg = 'black')
+      red   = Array.new(HISTOGRAM_COLS, 0)
+      green = Array.new(HISTOGRAM_COLS, 0)
+      blue  = Array.new(HISTOGRAM_COLS, 0)
+      alpha = Array.new(HISTOGRAM_COLS, 0)
+      int   = Array.new(HISTOGRAM_COLS, 0)
+
+      rows.times do |row|
+        pixels = get_pixels(0, row, columns, 1)
+        pixels.each do |pixel|
+          red[pixel.red & MAX_QUANTUM] += 1
+          green[pixel.green & MAX_QUANTUM] += 1
+          blue[pixel.blue & MAX_QUANTUM] += 1
+
+          # Only count opacity channel if some pixels are not opaque.
+          alpha[pixel.opacity & MAX_QUANTUM] += 1 unless opaque?
+          v = pixel_intensity(pixel)
+          int[v] += 1
         end
+      end
 
-        # 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.
+      # 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)
+      max = [red.max, green.max, blue.max, alpha.max, int.max].max
+      scale = HISTOGRAM_ROWS / (max * AIR_FACTOR)
 
-        charts = ImageList.new
+      charts = ImageList.new
 
-        # Add the thumbnail.
-        thumb = copy
-        thumb['Label'] = File.basename(filename)
-        charts << thumb
+      # Add the thumbnail.
+      thumb = copy
+      thumb['Label'] = File.basename(filename)
+      charts << thumb
 
-        # Compute the channel and intensity histograms.
-        channel_hists = channel_histograms(red, green, blue, int, scale, fg, bg)
+      # Compute the channel and intensity histograms.
+      channel_hists = channel_histograms(red, green, blue, int, scale, fg, bg)
 
-        # Add the red, green, and blue histograms to the list
-        charts << channel_hists.shift
-        charts << channel_hists.shift
-        charts << channel_hists.shift
+      # Add the red, green, and blue histograms to the list
+      charts << channel_hists.shift
+      charts << channel_hists.shift
+      charts << channel_hists.shift
 
-        # Add Alpha channel or image stats
-        if !opaque?
-          charts << alpha_hist(alpha, scale, fg, bg)
-        else
-          charts << info_text(fg, bg)
-        end
+      # Add Alpha channel or image stats
+      charts << if !opaque?
+                  alpha_hist(alpha, scale, fg, bg)
+                else
+                  info_text(fg, bg)
+                end
 
-        # Add the RGB histogram
-        charts << channel_hists.shift
+      # Add the RGB histogram
+      charts << channel_hists.shift
 
-        # Add the intensity histogram.
-        charts << intensity_hist(channel_hists.shift)
+      # Add the intensity histogram.
+      charts << intensity_hist(channel_hists.shift)
 
-        # Add the color frequency histogram.
-        charts << color_hist(fg, bg)
+      # Add the color frequency histogram.
+      charts << color_hist(fg, bg)
 
-        # Make a montage.
-        histogram = charts.montage do
-          self.background_color = bg
-          self.stroke = 'transparent'
-          self.fill = fg
-          self.border_width = 1
-          self.tile         = '4x2'
-          self.geometry     = "#{HISTOGRAM_COLS}x#{HISTOGRAM_ROWS}+10+10"
-        end
-
-        histogram
+      # Make a montage.
+      histogram = charts.montage do
+        self.background_color = bg
+        self.stroke = 'transparent'
+        self.fill = fg
+        self.border_width = 1
+        self.tile         = '4x2'
+        self.geometry     = "#{HISTOGRAM_COLS}x#{HISTOGRAM_ROWS}+10+10"
       end
+
+      histogram
+    end
   end
 end
 
@@ -292,13 +285,11 @@ end
 
 # Only process first frame if multi-frame image
 image = Magick::Image.read(filename)
-if image.length > 1
-  puts 'Charting 1st image'
-end
+puts 'Charting 1st image' if image.length > 1
 image = image.first
 
 # Give the user something to look at while we're working.
-name = File.basename(filename).sub(/\..*?$/,'')
+name = File.basename(filename).sub(/\..*?$/, '')
 $defout.sync = true
 printf "Creating #{name}_Histogram.miff"