zpng 0.1.0 → 0.1.1

data/Gemfile

@@ -2,8 +2,8 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'colorize'
 gem 'hexdump'
+gem 'rainbow'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    colorize (0.5.8)
     diff-lcs (1.1.3)
     git (1.2.5)
     hexdump (0.2.3)
@@ -11,6 +10,7 @@ GEM
       rake
       rdoc
     json (1.7.5)
+    rainbow (1.1.4)
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -28,7 +28,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  colorize
   hexdump
   jeweler (~> 1.8.4)
+  rainbow
   rspec (>= 2.8.0)

data/README.md

@@ -20,13 +20,18 @@ Usage
         -q, --quiet                      Silent any warnings (can be used multiple times)
         -C, --chunks                     Show file chunks (default)
         -i, --info                       General image info (default)
-        -A, --ascii                      Try to display image as ASCII (works best with monochrome images)
         -S, --scanlines                  Show scanlines info
         -P, --palette                    Show palette
         -E, --extract-chunk ID           extract a single chunk
         -U, --unpack-imagedata           unpack Image Data (IDAT) chunk(s), output to stdout
+    
         -c, --crop GEOMETRY              crop image, {WIDTH}x{HEIGHT}+{X}+{Y},
                                          puts results on stdout unless --ascii given
+    
+        -A, --ascii                      Try to convert image to ASCII (works best with monochrome images)
+        -N, --ansi                       Try to display image as ANSI colored text
+        -2, --256                        Try to display image as 256-colored text
+        -W, --wide                       Use 2 horizontal characters per one pixel
 
 ### Info
 
@@ -39,7 +44,7 @@ Usage
 
     # zpng --chunks qr_aux_chunks.png
 
-    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, width=35, height=35, depth=1, color=0, compression=0, filter=0, interlace=0, idx=0> CRC OK
+    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, idx=0, interlace=0, filter=0, compression=0, height=35, width=35, depth=1, color=0> CRC OK
     [.] <Chunk #01 gAMA size=     4, crc=0bfc6105 > CRC OK
     [.] <Chunk #02 sRGB size=     1, crc=aece1ce9 > CRC OK
     [.] <Chunk #03 cHRM size=    32, crc=9cba513c > CRC OK
@@ -53,82 +58,82 @@ Usage
 
 source image: ![qr_rgb.png](https://github.com/zed-0xff/zpng/raw/master/samples/qr_rgb.png)
 
-    # zpng --ascii qr_rgb.png
-
-                                       
-     ####### ##     ## # ##    ####### 
-     #     #       ## # ##     #     # 
-     # ### # #  #####  # #  ## # ### # 
-     # ### # ## #    # #### ## # ### # 
-     # ### # #### #    # ####  # ### # 
-     #     #  #  # #  #####    #     # 
-     ####### # # # # # # # # # ####### 
-              # # ##     ## ##         
-     ####  # #    ## # ##    ##  ### # 
-      # ##   ##     ## # ## # ###   ## 
-     # ### ##      ## # ##  ## # ### # 
-        ### #   #####  # #   ## #   #  
-     ## ## #  # #    # ####  ## ##     
-       #  # ## ## #    # ### ##    ##  
-     # ###### ## # #  #####  #######   
-     # ####  ### ## # ##    #   ## #   
-       ## ##  ###     ## # ## ######## 
-         #  ###  ##     ## ######### # 
-     #### ##### ##     ## #   #   # #  
-      ## #  #  # #  #####  # #  ##   # 
-       ###### ##### #    # ##      #   
-      ###     #  #### #    ### #   ### 
-     ###  #### ####  # #  #######   ## 
-     # # ## ## #     ## # ## ###### #  
-      # #######  # ##     ## #####   # 
-             # ### # ##     ##   # #   
-     #######    # # ##     ### # #     
-     #     #  ###  # #  ######   ### # 
-     # ### #     # #### #   ########   
-     # ### # ###   # #### # # #        
-     # ### # ###  #####  # ##  #  #    
-     #     # #### ##     ## ###      # 
-     ####### # #  ## # ##   # ##   #
+    # zpng --ascii --wide qr_rgb.png
+
+                                                                          
+      ##############  ####          ####  ##  ####        ##############  
+      ##          ##              ####  ##  ####          ##          ##  
+      ##  ######  ##  ##    ##########    ##  ##    ####  ##  ######  ##  
+      ##  ######  ##  ####  ##        ##  ########  ####  ##  ######  ##  
+      ##  ######  ##  ########  ##        ##  ########    ##  ######  ##  
+      ##          ##    ##    ##  ##    ##########        ##          ##  
+      ##############  ##  ##  ##  ##  ##  ##  ##  ##  ##  ##############  
+                        ##  ##  ####          ####  ####                  
+      ########    ##  ##        ####  ##  ####        ####    ######  ##  
+        ##  ####      ####          ####  ##  ####  ##  ######      ####  
+      ##  ######  ####            ####  ##  ####    ####  ##  ######  ##  
+            ######  ##      ##########    ##  ##      ####  ##      ##    
+      ####  ####  ##    ##  ##        ##  ########    ####  ####          
+          ##    ##  ####  ####  ##        ##  ######  ####        ####    
+      ##  ############  ####  ##  ##    ##########    ##############      
+      ##  ########    ######  ####  ##  ####        ##      ####  ##      
+          ####  ####    ######          ####  ##  ####  ################  
+              ##    ######    ####          ####  ##################  ##  
+      ########  ##########  ####          ####  ##      ##      ##  ##    
+        ####  ##    ##    ##  ##    ##########    ##  ##    ####      ##  
+          ############  ##########  ##        ##  ####            ##      
+        ######          ##    ########  ##        ######  ##      ######  
+      ######    ########  ########    ##  ##    ##############      ####  
+      ##  ##  ####  ####  ##          ####  ##  ####  ############  ##    
+        ##  ##############    ##  ####          ####  ##########      ##  
+                      ##  ######  ##  ####          ####      ##  ##      
+      ##############        ##  ##  ####          ######  ##  ##          
+      ##          ##    ######    ##  ##    ############      ######  ##  
+      ##  ######  ##          ##  ########  ##      ################      
+      ##  ######  ##  ######      ##  ########  ##  ##  ##                
+      ##  ######  ##  ######    ##########    ##  ####    ##    ##        
+      ##          ##  ########  ####          ####  ######            ##  
+      ##############  ##  ##    ####  ##  ####      ##  ####      ##
 
 ### Scanlines
 
     # zpng --scanlines qr_rgb.png
 
-    [#<ZPNG::ScanLine idx=0, bpp=24, offset=1, filter=1>,
-     #<ZPNG::ScanLine idx=1, bpp=24, offset=107, filter=4>,
-     #<ZPNG::ScanLine idx=2, bpp=24, offset=213, filter=4>,
-     #<ZPNG::ScanLine idx=3, bpp=24, offset=319, filter=4>,
-     #<ZPNG::ScanLine idx=4, bpp=24, offset=425, filter=2>,
-     #<ZPNG::ScanLine idx=5, bpp=24, offset=531, filter=2>,
-     #<ZPNG::ScanLine idx=6, bpp=24, offset=637, filter=4>,
-     #<ZPNG::ScanLine idx=7, bpp=24, offset=743, filter=0>,
-     #<ZPNG::ScanLine idx=8, bpp=24, offset=849, filter=1>,
-     #<ZPNG::ScanLine idx=9, bpp=24, offset=955, filter=0>,
-     #<ZPNG::ScanLine idx=10, bpp=24, offset=1061, filter=0>,
-     #<ZPNG::ScanLine idx=11, bpp=24, offset=1167, filter=0>,
-     #<ZPNG::ScanLine idx=12, bpp=24, offset=1273, filter=1>,
-     #<ZPNG::ScanLine idx=13, bpp=24, offset=1379, filter=2>,
-     #<ZPNG::ScanLine idx=14, bpp=24, offset=1485, filter=4>,
-     #<ZPNG::ScanLine idx=15, bpp=24, offset=1591, filter=0>,
-     #<ZPNG::ScanLine idx=16, bpp=24, offset=1697, filter=4>,
-     #<ZPNG::ScanLine idx=17, bpp=24, offset=1803, filter=0>,
-     #<ZPNG::ScanLine idx=18, bpp=24, offset=1909, filter=4>,
-     #<ZPNG::ScanLine idx=19, bpp=24, offset=2015, filter=4>,
-     #<ZPNG::ScanLine idx=20, bpp=24, offset=2121, filter=0>,
-     #<ZPNG::ScanLine idx=21, bpp=24, offset=2227, filter=1>,
-     #<ZPNG::ScanLine idx=22, bpp=24, offset=2333, filter=2>,
-     #<ZPNG::ScanLine idx=23, bpp=24, offset=2439, filter=0>,
-     #<ZPNG::ScanLine idx=24, bpp=24, offset=2545, filter=2>,
-     #<ZPNG::ScanLine idx=25, bpp=24, offset=2651, filter=1>,
-     #<ZPNG::ScanLine idx=26, bpp=24, offset=2757, filter=1>,
-     #<ZPNG::ScanLine idx=27, bpp=24, offset=2863, filter=4>,
-     #<ZPNG::ScanLine idx=28, bpp=24, offset=2969, filter=4>,
-     #<ZPNG::ScanLine idx=29, bpp=24, offset=3075, filter=4>,
-     #<ZPNG::ScanLine idx=30, bpp=24, offset=3181, filter=4>,
-     #<ZPNG::ScanLine idx=31, bpp=24, offset=3287, filter=2>,
-     #<ZPNG::ScanLine idx=32, bpp=24, offset=3393, filter=4>,
-     #<ZPNG::ScanLine idx=33, bpp=24, offset=3499, filter=4>,
-     #<ZPNG::ScanLine idx=34, bpp=24, offset=3605, filter=1>]
+    [#<ZPNG::ScanLine idx=0  offset=1   size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=1  offset=107 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=2  offset=213 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=3  offset=319 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=4  offset=425 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=5  offset=531 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=6  offset=637 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=7  offset=743 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=8  offset=849 size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=9  offset=955 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=10 offset=1061 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=11 offset=1167 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=12 offset=1273 size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=13 offset=1379 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=14 offset=1485 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=15 offset=1591 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=16 offset=1697 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=17 offset=1803 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=18 offset=1909 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=19 offset=2015 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=20 offset=2121 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=21 offset=2227 size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=22 offset=2333 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=23 offset=2439 size=106 bpp=24 filter=0>,
+     #<ZPNG::ScanLine idx=24 offset=2545 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=25 offset=2651 size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=26 offset=2757 size=106 bpp=24 filter=1>,
+     #<ZPNG::ScanLine idx=27 offset=2863 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=28 offset=2969 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=29 offset=3075 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=30 offset=3181 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=31 offset=3287 size=106 bpp=24 filter=2>,
+     #<ZPNG::ScanLine idx=32 offset=3393 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=33 offset=3499 size=106 bpp=24 filter=4>,
+     #<ZPNG::ScanLine idx=34 offset=3605 size=106 bpp=24 filter=1>]
 
 ### Palette
 

data/README.md.tpl

@@ -27,7 +27,7 @@ Usage
 
 source image: ![qr_rgb.png](https://github.com/zed-0xff/zpng/raw/master/samples/qr_rgb.png)
 
-% zpng --ascii qr_rgb.png
+% zpng --ascii --wide qr_rgb.png
 
 ### Scanlines
 

data/Rakefile

@@ -86,8 +86,7 @@ Rake::Task[:console].clear
 # from /usr/local/lib64/ruby/gems/1.9.1/gems/jeweler-1.8.4/lib/jeweler/tasks.rb
 desc "Start IRB with all runtime dependencies loaded"
 task :console, [:script] do |t,args|
-  # TODO move to a command
-  dirs = ['ext', 'lib'].select { |dir| File.directory?(dir) }
+  dirs = ['./ext', './lib'].select { |dir| File.directory?(dir) }
 
   original_load_path = $LOAD_PATH
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/zpng/adam7_decoder.rb

@@ -0,0 +1,63 @@
+module ZPNG
+  class Adam7Decoder
+    attr_accessor :image
+
+    def initialize image
+      @image = image
+    end
+
+    def scanlines_count
+      (15*image.height/8.0).ceil
+    end
+
+    WIDTHS = [1,1,2,2,2,4,4,4,4,4,4,8,8,8,8]
+
+    # scanline width in pixels
+    def scanline_width idx
+      #image.width/8*(2**(idx/2))
+      WIDTHS[idx*8/image.height]*(image.width/8)
+    end
+
+    # scanline size in bytes, INCLUDING leading filter byte
+    def scanline_size idx
+      (scanline_width(idx) * image.bpp / 8.0).ceil + 1
+    end
+
+    # scanline offset in imagedata
+    def scanline_offset idx
+      #TODO: optimize
+      (0...idx).map{ |x| scanline_size(x) }.inject(&:+) || 0
+    end
+
+    # convert "flat" coords in scanline number & pos in scanline
+    def convert_coords x,y
+      # optimizing this into one switch/case statement gives
+      # about 1-2% speed increase (ruby 1.9.3p286)
+
+      if y%2 == 1
+        # 7th pass: last height/2 full scanlines
+        [x, y/2 + image.height*11/8]
+      elsif x%2 == 1 && y%2 == 0
+        # 6th pass
+        [x/2, y/2 + image.height*7/8]
+      elsif x%8 == 0 && y%8 == 0
+        # 1st pass
+        [x/8, y/8]
+      elsif x%8 == 4 && y%8 == 0
+        # 2nd pass
+        [x/8, y/8 + image.height/8]
+      elsif x%4 == 0 && y%8 == 4
+        # 3rd pass
+        [x/4, y/8 + image.height*2/8]
+      elsif x%4 == 2 && y%4 == 0
+        # 4th pass
+        [x/4, y/4 + image.height*3/8]
+      elsif x%2 == 0 && y%4 == 2
+        # 5th pass
+        [x/2, y/4 + image.height*5/8]
+      else
+        raise "invalid coords"
+      end
+    end
+  end
+end

data/lib/zpng/cli.rb

@@ -8,7 +8,6 @@ class ZPNG::CLI
   ACTIONS = {
     'chunks'    => 'Show file chunks (default)',
     %w'i info'      => 'General image info (default)',
-    'ascii'     => 'Try to display image as ASCII (works best with monochrome images)',
     'scanlines' => 'Show scanlines info',
     'palette'   => 'Show palette'
   }
@@ -46,10 +45,25 @@ class ZPNG::CLI
         @actions << :unpack_imagedata
       end
 
+      opts.separator ""
       opts.on "-c", "--crop GEOMETRY", "crop image, {WIDTH}x{HEIGHT}+{X}+{Y},",
       "puts results on stdout unless --ascii given" do |x|
         @actions << [:crop, x]
       end
+
+      opts.separator ""
+      opts.on "-A", '--ascii', 'Try to convert image to ASCII (works best with monochrome images)' do
+        @actions << :ascii
+      end
+      opts.on "-N", '--ansi', 'Try to display image as ANSI colored text' do
+        @actions << :ansi
+      end
+      opts.on "-2", '--256', 'Try to display image as 256-colored text' do
+        @actions << :ansi256
+      end
+      opts.on "-W", '--wide', 'Use 2 horizontal characters per one pixel' do
+        @options[:wide] = true
+      end
     end
 
     if (argv = optparser.parse(@argv)).empty?
@@ -120,7 +134,35 @@ class ZPNG::CLI
   end
 
   def ascii
-    puts @img.to_s
+    @img.height.times do |y|
+      @img.width.times do |x|
+        c = @img[x,y].to_ascii
+        c *= 2 if @options[:wide]
+        print c
+      end
+      puts
+    end
+  end
+
+  def ansi
+    spc = @options[:wide] ? "  " : " "
+    @img.height.times do |y|
+      @img.width.times do |x|
+        print spc.background(@img[x,y].closest_ansi_color)
+      end
+      puts
+    end
+  end
+
+  def ansi256
+    require 'rainbow'
+    spc = @options[:wide] ? "  " : " "
+    @img.height.times do |y|
+      @img.width.times do |x|
+        print spc.background(@img[x,y].to_s)
+      end
+      puts
+    end
   end
 
   def scanlines

data/lib/zpng/color.rb

@@ -9,8 +9,33 @@ module ZPNG
     alias :alpha :a
     def alpha= v; self.a = v; end
 
-    BLACK = Color.new(0,0,0,0xff)
-    WHITE = Color.new(0xff,0xff,0xff,0xff)
+    BLACK = Color.new(0  ,  0,  0, 255)
+    WHITE = Color.new(255,255,255, 255)
+
+    RED   = Color.new(255,  0,  0, 255)
+    GREEN = Color.new(0  ,255,  0, 255)
+    BLUE  = Color.new(0  ,  0,255, 255)
+
+    YELLOW= Color.new(255,255,  0, 255)
+    CYAN  = Color.new(  0,255,255, 255)
+    PURPLE= MAGENTA =
+            Color.new(255,  0,255, 255)
+
+    ANSI_COLORS = [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white]
+
+    # euclidian distance - http://en.wikipedia.org/wiki/Euclidean_distance
+    def euclidian other_color
+      r  = (self.r.to_i - other_color.r.to_i)**2
+      r += (self.g.to_i - other_color.g.to_i)**2
+      r += (self.b.to_i - other_color.b.to_i)**2
+      Math.sqrt r
+    end
+
+    def closest_ansi_color
+      a = ANSI_COLORS.map{|c| self.class.const_get(c.to_s.upcase) }
+      a.map!{ |c| self.euclidian(c) }
+      ANSI_COLORS[a.index(a.min)]
+    end
 
     def white?
       r == 0xff && g == 0xff && b == 0xff
@@ -36,6 +61,15 @@ module ZPNG
       "%02X%02X%02X" % [r,g,b]
     end
 
+    # try to convert to pseudographics
+    def to_ascii h={}
+      white   = h[:white]   || ' '
+      black   = h[:black]   || '#'
+      unknown = h[:unknown] || '?'
+
+      self.white?? white : (self.black?? black : unknown)
+    end
+
     def to_i
       ((a||0) << 24) + ((r||0) << 16) + ((g||0) << 8) + (b||0)
     end
@@ -47,8 +81,13 @@ module ZPNG
         rs = r ? "%02x" % r : "??"
         gs = g ? "%02x" % g : "??"
         bs = b ? "%02x" % b : "??"
-        as = a ? "%d"   % a : "?"
-        "#<ZPNG::Color #%s%s%s%s a=%s>" % [rs,gs,bs,as]
+        if a
+          # alpha is non-NULL
+          "#<ZPNG::Color #%s%s%s a=%d>" % [rs,gs,bs,a]
+        else
+          # alpha is NULL
+          "#<ZPNG::Color #%s%s%s>" % [rs,gs,bs]
+        end
       end
     end
   end

data/lib/zpng/image.rb

@@ -22,6 +22,10 @@ module ZPNG
       end
     end
 
+    def adam7
+      @adam7 ||= Adam7Decoder.new(self)
+    end
+
     # load image from file
     def self.load fname
       open(fname,"rb") do |f|
@@ -49,7 +53,7 @@ module ZPNG
       @chunks << (@header  = Chunk::IHDR.new(h))
       if @header.palette_used?
         @chunks << (@palette = Chunk::PLTE.new)
-        @palette[0] = h[:bg] || Color::BLACK # add default bg color
+        @palette[0] = h[:background] || h[:bg] || Color::BLACK # add default bg color
       end
     end
 
@@ -98,6 +102,10 @@ module ZPNG
       end
     end
 
+    def bpp
+      @header && @header.bpp
+    end
+
     def width
       @header && @header.width
     end
@@ -110,25 +118,27 @@ module ZPNG
       @header && @header.grayscale?
     end
 
+    def interlaced?
+      @header && @header.interlace != 0
+    end
+
     def imagedata
       @imagedata ||=
         begin
-          if @header
-            raise "only non-interlaced mode is supported for imagedata" if @header.interlace != 0
-          else
-            puts "[?] no image header, assuming non-interlaced RGB".yellow
-          end
+          puts "[?] no image header, assuming non-interlaced RGB".yellow unless @header
           data = @chunks.find_all{ |c| c.is_a?(Chunk::IDAT) }.map(&:data).join
           (data && data.size > 0) ? Zlib::Inflate.inflate(data) : ''
         end
     end
 
     def [] x, y
+      x,y = adam7.convert_coords(x,y) if interlaced?
       scanlines[y][x]
     end
 
     def []= x, y, newpixel
       decode_all_scanlines
+      x,y = adam7.convert_coords(x,y) if interlaced?
       scanlines[y][x] = newpixel
     end
 
@@ -144,7 +154,8 @@ module ZPNG
       @scanlines ||=
         begin
           r = []
-          height.to_i.times do |i|
+          n = interlaced? ? adam7.scanlines_count : height.to_i
+          n.times do |i|
             r << ScanLine.new(self,i)
           end
           r.delete_if(&:bad?)
@@ -154,7 +165,11 @@ module ZPNG
 
     def to_s h={}
       if scanlines.any?
-        scanlines.map{ |l| l.to_s(h) }.join("\n")
+        if interlaced?
+          height.times.map{ |y| width.times.map{ |x| self[x,y].to_ascii(h) }.join }.join("\n")
+        else
+          scanlines.map{ |l| l.to_s(h) }.join("\n")
+        end
       else
         super()
       end

data/lib/zpng/scan_line.rb

@@ -7,7 +7,7 @@ module ZPNG
     FILTER_AVERAGE        = 3
     FILTER_PAETH          = 4
 
-    attr_accessor :image, :idx, :filter, :offset
+    attr_accessor :image, :idx, :filter, :offset, :bpp
 
     def initialize image, idx
       @image,@idx = image,idx
@@ -22,7 +22,12 @@ module ZPNG
         @decoded_bytes = "\x00" * (size-1)
         @filter = FILTER_NONE
       else
-        @offset = idx*size
+        @offset =
+          if image.interlaced?
+            image.adam7.scanline_offset(idx)
+          else
+            idx*size
+          end
         if @filter = image.imagedata[@offset]
           @filter = @filter.ord
         else
@@ -39,28 +44,32 @@ module ZPNG
 
     # total scanline size in bytes, INCLUDING leading 'filter' byte
     def size
+      w =
+        if image.interlaced?
+          image.adam7.scanline_width(idx)
+        else
+          image.width
+        end
       if @BPP
-        image.width*@BPP+1
+        w*@BPP+1
       else
-        (image.width*@bpp/8.0+1).ceil
+        (w*@bpp/8.0+1).ceil
       end
     end
 
     def inspect
-      "#<ZPNG::ScanLine " + (instance_variables-[:@image, :@decoded, :@BPP]).
-          map{ |var| "#{var.to_s.tr('@','')}=#{instance_variable_get(var)}" }.
-          join(", ") + ">"
+      if image.interlaced?
+        "#<ZPNG::ScanLine idx=%-2d offset=%-3d width=%-2d size=%-2d bpp=%d filter=%d>" %
+          [idx, offset, image.adam7.scanline_width(idx), size, bpp, filter]
+      else
+        "#<ZPNG::ScanLine idx=%-2d offset=%-3d size=%-2d bpp=%d filter=%d>" %
+          [idx, offset, size, bpp, filter]
+      end
     end
 
     def to_s h={}
-      white   = h[:white]   || ' '
-      black   = h[:black]   || '#'
-      unknown = h[:unknown] || '?'
-
       @image.width.times.map do |i|
-        px = decode_pixel(i)
-#        printf "[d] %08x %s %s\n", px.to_i, px.inspect, px.to_s unless px.black?
-        px.white?? white : (px.black?? black : unknown)
+        decode_pixel(i).to_ascii(h)
       end.join
     end
 

data/lib/zpng/string_ext.rb

@@ -0,0 +1,11 @@
+require 'rainbow'
+
+class String
+  [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white].each do |color|
+    unless instance_methods.include?(color)
+      define_method color do
+        self.send(:color, color)
+      end
+    end
+  end
+end

data/lib/zpng.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 require 'zlib'
 require 'stringio'
-require 'colorize'
+
+require 'zpng/string_ext'
 
 require 'zpng/color'
 require 'zpng/block'
 require 'zpng/scan_line'
 require 'zpng/chunk'
 require 'zpng/image'
+require 'zpng/adam7_decoder'
 
 # see alse http://github.com/wvanbergen/chunky_png/
 

data/spec/color_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ZPNG::Color do
+
+  ZPNG::Color::ANSI_COLORS.each do |color_sym|
+    it "finds closest color for #{color_sym}" do
+      color = ZPNG::Color.const_get(color_sym.to_s.upcase)
+      color.closest_ansi_color.should == color_sym
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,9 +7,6 @@ require 'zpng'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |config|
-end
-
 SAMPLES_DIR = File.join(
   File.dirname(
     File.dirname(
@@ -22,3 +19,32 @@ SAMPLES =
   else
     Dir[File.join(SAMPLES_DIR,'qr_*.png')]
   end
+
+PNG_SUITE_URL = "http://www.schaik.com/pngsuite/PngSuite-2011apr25.tgz"
+
+def get_png_suite
+  dir = File.join(SAMPLES_DIR, "png_suite")
+  if Dir.exist?(dir)
+    if Dir[File.join(dir, "*.png")].size > 100
+      # already fetched and unpacked
+      return
+    end
+  else
+    Dir.mkdir(dir)
+  end
+  require 'open-uri'
+  puts "[.] fetching PNG test-suite from #{PNG_SUITE_URL} .. "
+  data = open(PNG_SUITE_URL).read
+
+  fname = File.join(dir, "png_suite.tgz")
+  File.open(fname, "wb"){ |f| f<<data }
+  puts "[.] unpacking .. "
+  system "tar", "xzf", fname, "-C", dir
+end
+
+RSpec.configure do |config|
+  config.before :suite do
+    get_png_suite
+  end
+end
+

data/zpng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zpng"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2012-12-10"
+  s.date = "2012-12-21"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zpng"]
   s.extra_rdoc_files = [
@@ -29,12 +29,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/zpng",
     "lib/zpng.rb",
+    "lib/zpng/adam7_decoder.rb",
     "lib/zpng/block.rb",
     "lib/zpng/chunk.rb",
     "lib/zpng/cli.rb",
     "lib/zpng/color.rb",
     "lib/zpng/image.rb",
     "lib/zpng/scan_line.rb",
+    "lib/zpng/string_ext.rb",
     "samples/captcha_4bpp.png",
     "samples/modify.rb",
     "samples/qr_aux_chunks.png",
@@ -46,6 +48,7 @@ Gem::Specification.new do |s|
     "samples/qr_rgb.png",
     "samples/qr_rgba.png",
     "spec/ascii_spec.rb",
+    "spec/color_spec.rb",
     "spec/create_image_spec.rb",
     "spec/crop_spec.rb",
     "spec/image_spec.rb",
@@ -65,21 +68,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_runtime_dependency(%q<hexdump>, [">= 0"])
+      s.add_runtime_dependency(%q<rainbow>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
-      s.add_dependency(%q<colorize>, [">= 0"])
       s.add_dependency(%q<hexdump>, [">= 0"])
+      s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
-    s.add_dependency(%q<colorize>, [">= 0"])
     s.add_dependency(%q<hexdump>, [">= 0"])
+    s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

metadata

@@ -2,19 +2,19 @@
 name: zpng
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
   type: :runtime
-  name: colorize
+  name: hexdump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -30,7 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
   type: :runtime
-  name: hexdump
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -112,12 +112,14 @@ files:
 - VERSION
 - bin/zpng
 - lib/zpng.rb
+- lib/zpng/adam7_decoder.rb
 - lib/zpng/block.rb
 - lib/zpng/chunk.rb
 - lib/zpng/cli.rb
 - lib/zpng/color.rb
 - lib/zpng/image.rb
 - lib/zpng/scan_line.rb
+- lib/zpng/string_ext.rb
 - samples/captcha_4bpp.png
 - samples/modify.rb
 - samples/qr_aux_chunks.png
@@ -129,6 +131,7 @@ files:
 - samples/qr_rgb.png
 - samples/qr_rgba.png
 - spec/ascii_spec.rb
+- spec/color_spec.rb
 - spec/create_image_spec.rb
 - spec/crop_spec.rb
 - spec/image_spec.rb
@@ -151,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -488684070557161038
+      hash: 2879730800431969805
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: