axon 0.1.1 → 0.2.0

data/lib/axon/alpha_stripper.rb

@@ -0,0 +1,69 @@
+module Axon
+
+  # == Strips the Alpha Channel from an Image
+  #
+  # Axon::AlphaStripper Removes the Alpha Channel from an Image.
+  #
+  # == Example
+  #
+  #
+  class AlphaStripper
+
+    # :call-seq:
+    #   AlphaStripper.new(image_in)
+    #
+    # Removes the alpha channel from +image_in+.
+    #
+    def initialize(source)
+      @source = source
+    end
+
+    # Gets the height of the image. Same as the height of the source image.
+    #
+    def height
+      @source.height
+    end
+
+    # Gets the width of the image. Same as the width of the source image.
+    #
+    def width
+      @source.width
+    end
+
+    # Gets the components in the image.
+    #
+    def components
+      case @source.components
+      when 2 then 1
+      when 4 then 3
+      else @source.components
+      end
+    end
+
+    # Gets the line number of the next scanline.
+    #
+    def lineno
+      @source.lineno
+    end
+
+    # Gets the next scanline from the image.
+    #
+    def gets
+      sl = @source.gets
+      return unless sl
+
+      # This should probably be done in C, but not seeing alpha stripping
+      # performance as terribly important right now.
+      case @source.components
+      when 2
+        (sl.size / 2).times{ |i| sl.slice!(1) }
+        sl
+      when 4
+        (sl.size / 4).times{ |i| sl.slice!(3) }
+        sl
+      else
+        sl
+      end
+    end
+  end
+end

data/lib/axon/cropper.rb

@@ -33,14 +33,17 @@ module Axon
     # cropped image will be truncated at the boundary.
     #
     def initialize(source, width, height, x_offset=nil, y_offset=nil)
+      x_offset ||= 0
+      y_offset ||= 0
+
       raise ArgumentError if width < 1 || height < 1
-      raise ArgumentError if x_offset && x_offset < 1 || y_offset && y_offset < 1
+      raise ArgumentError if x_offset < 0 || y_offset < 0
 
       @source = source
       @width = width
       @height = height
-      @x_offset = x_offset || 0
-      @y_offset = y_offset || 0
+      @x_offset = x_offset
+      @y_offset = y_offset
       @lineno = 0
     end
 
@@ -71,13 +74,6 @@ module Axon
       @source.components
     end
 
-    # Gets the color model of the cropped image. Same as the color model of the
-    # source image.
-    #
-    def color_model
-      @source.color_model
-    end
-
     # Gets the next scanline from the cropped image.
     #
     def gets

data/lib/axon/fit.rb

@@ -27,6 +27,7 @@ module Axon
     #
     def initialize(source, width, height)
       @source, @fit_width, @fit_height = source, width, height
+      @aspect_ratio = width / height.to_f
       @scaler = nil
     end
 
@@ -37,24 +38,17 @@ module Axon
       @source.components
     end
 
-    # Gets the color model of the fitted image. Same as the color model of the
-    # source image.
-    #
-    def color_model
-      @source.color_model
-    end
-
     # Gets the width of the fitted image. This will be the given width or less.
     #
     def width
-      @scaler ? @scaler.width : calculate_width
+      @scaler ? @scaler.width : (@source.width * calc_fit_ratio).to_i
     end
 
     # Gets the height of the fitted image. This will be the given height or
     # less.
     #
     def height
-      @scaler ? @scaler.height : calculate_height
+      @scaler ? @scaler.height : (@source.height * calc_fit_ratio).to_i
     end
 
     # Gets the index of the next line that will be fetched by gets, starting at
@@ -73,44 +67,68 @@ module Axon
 
     private
 
-    def calculate_width
-      (@source.width * calc_fit_ratio).to_i
-    end
-
-    def calculate_height
-      (@source.height * calc_fit_ratio).to_i
-    end
-
     def get_scaler
       r = calc_fit_ratio
+      return @source if r == 1
+      
+      final_width = (r * @source.width).to_i
+      final_height = (r * @source.height).to_i
+
+      if @source.kind_of?(JPEG::Reader)
+        jpeg_scale_dct(r)
+        r = calc_fit_ratio
+        return @source if r == 1
+      end
 
       if r > 1
-        NearestNeighborScaler.new(@source, width, height)
+        NearestNeighborScaler.new(@source, final_width, final_height)
       elsif r < 1
-        if r <= 0.5 && @source.kind_of?(JPEG::Reader)
-          @source.scale_denom = calc_jpeg_pre_shrink(r)
-          r = calc_fit_ratio
-        end
-        BilinearScaler.new(@source, width, height)
-      else
-        @source
+        BilinearScaler.new(@source, final_width, final_height)
       end
     end
 
-    private
+    def source_aspect_ratio
+      @source.width / @source.height.to_f
+    end
 
     def calc_fit_ratio
-      width_ratio = @fit_width.to_f / @source.width
-      height_ratio = @fit_height.to_f / @source.height
-      [width_ratio, height_ratio].min
+      if source_aspect_ratio > @aspect_ratio
+        @fit_width / @source.width.to_f
+      else
+        @fit_height / @source.height.to_f
+      end
     end
 
-    def calc_jpeg_pre_shrink(r)
-      case (1/r)
-      when (0...2) then nil
-      when (2...4) then 2
-      when (4...8) then 4
-      else 8
+    # Some versions of libjpeg can perform DCT scaling during the jpeg decoding
+    # phase. This is fast and accurate scaling, so we want to take advantage of
+    # it if at all possible.
+    #
+    # Since this form of scaling only happens in increments, we probably won't
+    # be able to scale to the exact desired size, so our strategy is to scale to
+    # as close to the desired size as possible without scaling too much.
+    #
+    # This depends on our version of libjpeg:
+    #   * libjpeg version 7 and greater can scale N/8 with all N from 1 to 16.
+    #   * libjpeg version 6 and below can scale 1/N with all N from 1 to 8.
+    #   * jruby doesn't do this at all
+    def jpeg_scale_dct(r)
+      return unless defined?(JPEG::LIB_VERSION)
+      if JPEG::LIB_VERSION >= 70
+        # when shrinking, we want scale_num to be the next highest integer
+        if r < 1
+          @source.scale_num = (r * 8).ceil
+        # when growing, we want scale_num to be the next lowest integer
+        else
+          @source.scale_num = (r * 8).to_i
+        end
+      else
+        if r <= 0.5
+          @source.scale_denom = case (1/r).to_i
+          when 2,3     then 2
+          when 4,5,6,7 then 4
+          else              8
+          end
+        end
       end
     end
   end

data/lib/axon/generators.rb

@@ -14,9 +14,6 @@ module Axon
     # The height of the generated image.
     attr_reader :height
 
-    # The color model of the generated image.
-    attr_reader :color_model
-
     # The components in the generated image.
     attr_reader :components
 
@@ -30,7 +27,6 @@ module Axon
     #
     # +options+ may contain the following optional hash key values:
     #
-    # * :color_model -- The color model of the generated image.
     # * :components -- The number of components in the generated image.
     #
     def initialize(width, height, options=nil)
@@ -38,7 +34,6 @@ module Axon
 
       @width = width
       @height = height
-      @color_model = options[:color_model] || :RGB
       @components = options[:components] || 3
       @lineno = 0
       @empty_string = String.new
@@ -73,9 +68,6 @@ module Axon
     # The height of the generated image.
     attr_reader :height
 
-    # The color model of the generated image.
-    attr_reader :color_model
-
     # The components in the generated image.
     attr_reader :components
 
@@ -90,10 +82,9 @@ module Axon
     # The optional argument +color+ is the binary value that will be assigned
     # to each pixel.
     #
-    def initialize(width, height, color=nil, color_model=nil)
+    def initialize(width, height, color=nil)
       @width, @height = width, height
       @color = color || "\x00\x00\x00"
-      @color_model = color_model || :RGB
       @components = @color.size
       @lineno = 0
     end

data/lib/axon/scalers.rb

@@ -46,13 +46,6 @@ module Axon
       @source.components
     end
 
-    # Gets the color model of the scaled image. Same as the color model of the
-    # source image.
-    #
-    def color_model
-      @source.color_model
-    end
-
     # Gets the next scanline from the cropped image.
     #
     def gets
@@ -121,13 +114,6 @@ module Axon
       @source.components
     end
 
-    # Gets the color model of the scaled image. Same as the color model of the
-    # source image.
-    #
-    def color_model
-      @source.color_model
-    end
-
     # Gets the next scanline from the cropped image.
     #
     def gets
@@ -152,9 +138,9 @@ module Axon
     end
 
     def read_with_padding
+      cmp = @source.components
       line = @source.gets
-      line << line[-@source.components, @source.components]
-      line
+      line + line[-cmp, cmp]
     end
   end
 end

data/test/helper.rb

@@ -8,7 +8,7 @@ module Axon
     # Generate a solid velvet image
     def setup
       super
-      @image = Solid.new 10, 15, "\x0A\x14\x69"
+      @image = Solid.new 10, 16, "\x0A\x14\x69"
       @io_out = StringIO.new
       @io_out.set_encoding 'ASCII-8BIT' if @io_out.respond_to?(:set_encoding)
     end
@@ -28,6 +28,10 @@ module Axon
       assert_nil image.gets, 'image.gets should be nil after reading height lines'
       assert_equal height, image.lineno
     end
+
+    def skip_symbol_fixnums
+      skip("ruby 1.8.7 treats symbols as fixnums") unless RUBY_VERSION >= "1.9"
+    end
   end
 
   class CustomError < RuntimeError; end
@@ -48,7 +52,6 @@ module Axon
 
     def height; @parent.height; end
     def width; @parent.width; end
-    def color_model; @parent.color_model; end
     def components; @parent.components; end
     def gets; @parent.gets; end
     def lineno; @parent.lineno; end
@@ -94,12 +97,11 @@ module Axon
   end
 
   class ArrayWrapper
-    attr_reader :lineno, :components, :color_model
+    attr_reader :lineno, :components
 
-    def initialize(ary, components=nil, color_model=nil)
+    def initialize(ary, components=nil)
       @ary = ary
       @components = components || 3
-      @color_model = color_model || :RGB
       @lineno = 0
     end
 
@@ -132,10 +134,6 @@ module Axon
       @source.components
     end
 
-    def color_model
-      @source.color_model
-    end
-
     def height
       @source.height
     end

data/test/reader_tests.rb

@@ -9,10 +9,6 @@ module Axon
       assert_equal @image.components, @reader.components
     end
     
-    def test_header_color_model
-      assert_equal @image.color_model, @reader.color_model
-    end
-    
     def test_io_returns_too_much_data
       io = CustomIO.new(Proc.new{ |io, *args| io.read(*args)[0..20] * 100 }, @data)
       assert_raises(RuntimeError) { @readerclass.new io }
@@ -33,10 +29,6 @@ module Axon
       assert_raises(CustomError) { @readerclass.new io }
     end
 
-    def test_empty_string_io
-      assert_raises(RuntimeError) { @readerclass.new(CustomIO.new("")) }
-    end
-    
     def test_not_a_string_io
       assert_raises(TypeError) { @readerclass.new(CustomIO.new(:foo)) }
     end

data/test/test_alpha_stripper.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+module Axon
+  class TestAlphaStripper < AxonTestCase
+    def test_strip_grayscale_alpha
+      im = Solid.new(20, 30, "\x00\x00")
+      noalpha = AlphaStripper.new(im)
+      assert_equal 1, noalpha.components
+      assert_image_dimensions noalpha, 20, 30
+    end
+
+    def test_strip_rgb_alpha
+      im = Solid.new(20, 30, "\x00\x00\x00\x00")
+      noalpha = AlphaStripper.new(im)
+      assert_equal 3, noalpha.components
+      assert_image_dimensions noalpha, 20, 30
+    end
+
+    def test_leaves_grayscale_untouched
+      im = Solid.new(20, 30, "\x00")
+      noalpha = AlphaStripper.new(im)
+      assert_equal 1, noalpha.components
+      assert_image_dimensions noalpha, 20, 30
+    end
+
+    def test_leaves_rgb_untouched
+      im = Solid.new(20, 30, "\x00\x00\x00")
+      noalpha = AlphaStripper.new(im)
+      assert_equal 3, noalpha.components
+      assert_image_dimensions noalpha, 20, 30
+    end
+  end
+end

data/test/test_fit.rb

@@ -31,5 +31,43 @@ module Axon
       r = Fit.new(im, 10, 20)
       assert_image_dimensions(r, 10, 20)
     end
+
+    def test_jpeg_pre_scale_one_half
+      skip "JRuby's JPEG decoder doesn't pre-scale" if(RUBY_PLATFORM =~ /java/)
+      io = StringIO.new
+      JPEG.write(Solid.new(10, 20), io)
+      io.rewind
+      im = JPEG::Reader.new(io)
+      width = im.width / 2
+      height = im.height / 2
+
+      r = Fit.new(im, width, height)
+      assert_image_dimensions(r, width, height)
+
+      if JPEG::LIB_VERSION >= 70
+        assert_equal(4, im.scale_num)
+      else
+        assert_equal(2, im.scale_denom)
+      end
+    end
+
+    def test_jpeg_pre_scale_two
+      skip "JRuby's JPEG decoder doesn't pre-scale" if(RUBY_PLATFORM =~ /java/)
+      io = StringIO.new
+      JPEG.write(Solid.new(10, 20), io)
+      io.rewind
+      im = JPEG::Reader.new(io)
+      width = im.width * 2
+      height = im.height * 2
+
+      r = Fit.new(im, width, height)
+      assert_image_dimensions(r, width, height)
+
+      if JPEG::LIB_VERSION >= 70
+        assert_equal(16, im.scale_num)
+      else
+        assert_equal(1, im.scale_denom)
+      end
+    end
   end
 end