zpng 0.2.0 → 0.2.1

data/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'hexdump'
 gem 'rainbow'
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -3,7 +3,6 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    hexdump (0.2.3)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -28,7 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  hexdump
   jeweler (~> 1.8.4)
   rainbow
   rspec (>= 2.8.0)

data/README.md

@@ -6,52 +6,91 @@ Description
 -----------
 A pure ruby PNG file manipulation & validation
 
+(If you need a high-level PNG creation toolkit - take a look at [SugarPNG](https://github.com/zed-0xff/sugar_png))
+
 Installation
 ------------
     gem install zpng
 
+Comparison
+----------
+ * supports `iTXt` (international text) chunks
+ * full support of 16-bit color & alpha depth
+ * correct 4bpp image decoding (as of 29-Dec-2012, ChunkyPNG had 1-bit error in 4bpp image decoding)
+
 Usage
 -----
 
     # zpng -h
 
     Usage: zpng [options] filename.png
-        -v, --verbose                    Run verbosely (can be used multiple times)
-        -q, --quiet                      Silent any warnings (can be used multiple times)
-        -C, --chunks                     Show file chunks (default)
+    
         -i, --info                       General image info (default)
+        -c, --chunk(s) [ID]              Show chunks (default) or single chunk by its #
+        -m, --metadata                   Show image metadata, if any (default)
+    
         -S, --scanlines                  Show scanlines info
         -P, --palette                    Show palette
         -E, --extract-chunk ID           extract a single chunk
         -D, --imagedata                  dump unpacked Image Data (IDAT) chunk(s) to stdout
     
-        -c, --crop GEOMETRY              crop image, {WIDTH}x{HEIGHT}+{X}+{Y},
+        -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
+    
+        -v, --verbose                    Run verbosely (can be used multiple times)
+        -q, --quiet                      Silent any warnings (can be used multiple times)
 
 ### Info
 
-    # zpng --info qr_rgb.png
+    # zpng qr_rgb.png
 
-    [.] image size 35x35
+    [.] image size 35x35, 24bpp, COLOR_RGB
     [.] uncompressed imagedata size = 3710 bytes
+    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, width=35, color=2, interlace=0, depth=8, compression=0, height=35, filter=0> CRC OK
+    [.] <Chunk #01 sRGB size=     1, crc=aece1ce9 > CRC OK
+    [.] <Chunk #02 IDAT size=   399, crc=59790716 > CRC OK
+    [.] <Chunk #03 IEND size=     0, crc=ae426082 > CRC OK
+
+### Info (verbose)
+
+    # zpng -v qr_rgb.png
+
+    [.] image size 35x35, 24bpp, COLOR_RGB
+    [.] uncompressed imagedata size = 3710 bytes
+        01 ff ff ff 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+        00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................| + 3678 bytes
+    
+    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, width=35, idx=0, color=2, interlace=0, depth=8, compression=0, height=35, filter=0> CRC OK
+        00 00 00 23 00 00 00 23  08 02 00 00 00           |...#...#.....   |
+    
+    [.] <Chunk #01 sRGB size=     1, crc=aece1ce9 > CRC OK
+        00                                                |.               |
+    
+    [.] <Chunk #02 IDAT size=   399, crc=59790716 > CRC OK
+        48 c7 bd 56 41 12 c4 20  08 d3 8e ff ff b2 7b 70  |H..VA.. ......{p|
+        86 d2 24 44 db c3 7a d8  d9 b6 08 18 03 a1 cf 39  |..$D..z........9| + 367 bytes
+    
+    [.] <Chunk #03 IEND size=     0, crc=ae426082 > CRC OK
+
+( add more `-v`'s for even more verbose output)
 
 ### Chunks
 
     # 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, width=35, color=0, interlace=0, depth=1, compression=0, height=35, filter=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
     [.] <Chunk #04 pHYs size=     9, crc=46c96b3e > CRC OK
     [.] <Chunk #05 IDAT size=   213, crc=5f3f1ff9 > CRC OK
-    [.] <Chunk #06 tEXt size=    37, crc=8d62fd1a > CRC OK
-    [.] <Chunk #07 tEXt size=    37, crc=fc3f45a6 > CRC OK
+    [.] <Chunk #06 tEXt size=    37, crc=8d62fd1a, keyword="date:create"> CRC OK
+    [.] <Chunk #07 tEXt size=    37, crc=fc3f45a6, keyword="date:modify"> CRC OK
     [.] <Chunk #08 IEND size=     0, crc=ae426082 > CRC OK
 
 ### ASCII
@@ -141,7 +180,8 @@ source image: ![qr_rgb.png](https://github.com/zed-0xff/zpng/raw/master/samples/
     # zpng --palette qr_plte_bw.png
 
     <Chunk #02 PLTE size=     6, crc=55c2d37e >
-    00000000  ff ff ff 00 00 00                                      |......|
+      color   #0:  ff ff ff  |...|
+      color   #1:  00 00 00  |...|
 
 
 ## Image manipulation

data/README.md.tpl

@@ -6,10 +6,18 @@ Description
 -----------
 A pure ruby PNG file manipulation & validation
 
+(If you need a high-level PNG creation toolkit - take a look at [SugarPNG](https://github.com/zed-0xff/sugar_png))
+
 Installation
 ------------
     gem install zpng
 
+Comparison
+----------
+ * supports `iTXt` (international text) chunks
+ * full support of 16-bit color & alpha depth
+ * correct 4bpp image decoding (as of 29-Dec-2012, ChunkyPNG had 1-bit error in 4bpp image decoding)
+
 Usage
 -----
 
@@ -17,7 +25,13 @@ Usage
 
 ### Info
 
-% zpng --info qr_rgb.png
+% zpng qr_rgb.png
+
+### Info (verbose)
+
+% zpng -v qr_rgb.png
+
+( add more `-v`'s for even more verbose output)
 
 ### Chunks
 

data/TODO

@@ -5,6 +5,12 @@ ways to hide info in PNG:
     * data after IEND
  * TEXT chunks
  * zTXT chunks
+    * comp_method
  * IDAT:
     * data after last scanline
     * last bits in scanline when bpp%8 != 0
+ * PLTE:
+    * raw letters
+    * stegano
+ * custom chunks
+ * crc

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/zpng.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'zlib'
 require 'stringio'
 
@@ -9,36 +8,9 @@ require 'zpng/color'
 require 'zpng/block'
 require 'zpng/scan_line'
 require 'zpng/chunk'
+require 'zpng/text_chunk'
 require 'zpng/image'
 require 'zpng/adam7_decoder'
-
-# see alse http://github.com/wvanbergen/chunky_png/
-
-if $0 == __FILE__
-  if ARGV.size == 0
-    puts "gimme a png filename!"
-  else
-    img = ZPNG::Image.new(ARGV[0])
-    img.dump
-    puts "[.] image size #{img.width}x#{img.height}"
-    puts "[.] uncompressed imagedata size=#{img.imagedata.size}"
-    puts "[.] palette =#{img.palette}"
-#    puts "[.] imagedata: #{img.imagedata[0..30].split('').map{|x| sprintf("%02X",x.ord)}.join(' ')}"
-
-    require 'hexdump'
-    #Hexdump.dump(img.imagedata, :width => 6)
-    require 'pp'
-    pp img.scanlines[0..5]
-#    puts Hexdump.dump(img.imagedata[0,60])
-#    img.scanlines.each do |l|
-#      puts l.to_s
-#    end
-    puts img.to_s
-    img[1,0]= ZPNG::Color.new(0,0,0)
-    puts img.to_s
-    File.open 'export.png','wb' do |f|
-      f << img.export
-    end
-  end
-end
-
+require 'zpng/hexdump'
+require 'zpng/metadata'
+require 'zpng/pixels'

data/lib/zpng/adam7_decoder.rb

@@ -18,7 +18,7 @@ module ZPNG
       @scanlines_count = 0
       # two leading zeroes added specially for convert_coords() code readability
       @pass_starts = [0,0] + @widths.map(&:size).map{ |x| @scanlines_count+=x }
-      @widths.flatten!
+      @widths.flatten! # yahoo! :))
     end
 
     # scanline width in pixels
@@ -67,5 +67,12 @@ module ZPNG
         raise "invalid coords"
       end
     end
+
+    # is the specified scanline is a first scanline in the pass?
+    # When the image is interlaced, each pass of the interlace pattern is
+    # treated as an independent image for filtering purposes
+    def pass_start? idx
+      @pass_starts.include?(idx)
+    end
   end
 end

data/lib/zpng/chunk.rb

@@ -54,7 +54,7 @@ module ZPNG
       @data || ''
     end
 
-    def inspect
+    def inspect verbosity = 10
       size = @size ? sprintf("%6d",@size) : sprintf("%6s","???")
       crc  = @crc  ? sprintf("%08x",@crc) : sprintf("%8s","???")
       type = @type.to_s.gsub(/[^0-9a-z]/i){ |x| sprintf("\\x%02X",x.ord) }
@@ -180,10 +180,11 @@ module ZPNG
         (@color & ALPHA_USED) != 0
       end
 
-      def inspect
+      def inspect verbosity = 10
+        vars = instance_variables - [:@type, :@crc, :@data, :@size]
+        vars -= [:@idx] if verbosity <= 0
         super.sub(/ *>$/,'') + ", " +
-          (instance_variables-[:@type, :@crc, :@data, :@size]).
-          map{ |var| "#{var.to_s.tr('@','')}=#{instance_variable_get(var)}" }.
+          vars.map{ |var| "#{var.to_s.tr('@','')}=#{instance_variable_get(var)}" }.
           join(", ") + ">"
       end
     end
@@ -214,7 +215,7 @@ module ZPNG
       end
 
       def add color
-        raise "palette full, cannot add color #{ncolors}" if ncolors >= max_colors
+        raise "palette full (#{ncolors}), cannot add #{color.inspect}" if ncolors >= max_colors
         idx = ncolors
         self[idx] = color
         idx
@@ -228,25 +229,7 @@ module ZPNG
 
     class IDAT < Chunk; end
     class IEND < Chunk; end
+    class TRNS < Chunk; end
 
-    class ZTXT < Chunk
-      attr_accessor :keyword, :comp_method, :text
-      def initialize *args
-        super
-        @keyword,@comp_method,@text = data.unpack('Z*Ca*')
-        if @text
-          @text = Zlib::Inflate.inflate(@text)
-        end
-      end
-      def inspect
-        super.sub(/ *>$/,'') + ", " +
-          (instance_variables-[:@type, :@crc, :@data, :@size]).
-          map do |var|
-            t = instance_variable_get(var).to_s
-            t = t[0..10] + "..." if t.size > 10
-            "#{var.to_s.tr('@','')}=#{t}"
-          end.join(", ") + ">"
-      end
-    end
   end
 end

data/lib/zpng/cli.rb

@@ -1,193 +1,248 @@
 require 'zpng'
 require 'optparse'
-require 'hexdump'
 require 'pp'
 
-class ZPNG::CLI
+module ZPNG
+  class CLI
+    include Hexdump
 
-  ACTIONS = {
-    'chunks'    => 'Show file chunks (default)',
-    %w'i info'      => 'General image info (default)',
-    'scanlines' => 'Show scanlines info',
-    'palette'   => 'Show palette'
-  }
-  DEFAULT_ACTIONS = %w'info chunks'
+    DEFAULT_ACTIONS = %w'info metadata chunks'
 
-  def initialize argv = ARGV
-    @argv = argv
-  end
-
-  def run
-    @actions = []
-    @options = { :verbose => 0 }
-    optparser = OptionParser.new do |opts|
-      opts.banner = "Usage: zpng [options] filename.png"
+    def initialize argv = ARGV
+      # hack #1: allow --chunk as well as --chunks
+      @argv = argv.map{ |x| x.sub(/^--chunks?/,'--chunk(s)') }
 
-      opts.on "-v", "--verbose", "Run verbosely (can be used multiple times)" do |v|
-        @options[:verbose] += 1
-      end
-      opts.on "-q", "--quiet", "Silent any warnings (can be used multiple times)" do |v|
-        @options[:verbose] -= 1
+      # hack #2: allow --chunk(s) followed by a non-number, like "zpng --chunks fname.png"
+      @argv.each_cons(2) do |a,b|
+        if a == "--chunk(s)" && b !~ /^\d+$/
+          a<<"=-1"
+        end
       end
+    end
 
-      ACTIONS.each do |t,desc|
-        if t.is_a?(Array)
-          opts.on *[ "-#{t[0]}", "--#{t[1]}", desc, eval("lambda{ |_| @actions << :#{t[1]} }") ]
-        else
-          opts.on *[ "-#{t[0].upcase}", "--#{t}", desc, eval("lambda{ |_| @actions << :#{t} }") ]
+    def run
+      @actions = []
+      @options = { :verbose => 0 }
+      optparser = OptionParser.new do |opts|
+        opts.banner = "Usage: zpng [options] filename.png"
+        opts.separator ""
+
+        opts.on("-i", "--info", "General image info (default)"){ @actions << :info }
+        opts.on("-c", "--chunk(s) [ID]", Integer, "Show chunks (default) or single chunk by its #") do |id|
+          id = nil if id == -1
+          @actions << [:chunks, id]
         end
-      end
+        opts.on("-m", "--metadata", "Show image metadata, if any (default)"){ @actions << :metadata }
 
-      opts.on "-E", "--extract-chunk ID", "extract a single chunk" do |id|
-        @actions << [:extract_chunk, id.to_i]
-      end
-      opts.on "-D", "--imagedata", "dump unpacked Image Data (IDAT) chunk(s) to stdout" do
-        @actions << :unpack_imagedata
-      end
+        opts.separator ""
+        opts.on("-S", "--scanlines", "Show scanlines info"){ @actions << :scanlines }
+        opts.on("-P", "--palette", "Show palette"){ @actions << :palette }
 
-      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.on "-E", "--extract-chunk ID", Integer, "extract a single chunk" do |id|
+          @actions << [:extract_chunk, id]
+        end
+        opts.on "-D", "--imagedata", "dump unpacked Image Data (IDAT) chunk(s) to stdout" do
+          @actions << :unpack_imagedata
+        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
+        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
+
+        opts.separator ""
+        opts.on "-v", "--verbose", "Run verbosely (can be used multiple times)" do |v|
+          @options[:verbose] += 1
+        end
+        opts.on "-q", "--quiet", "Silent any warnings (can be used multiple times)" do |v|
+          @options[:verbose] -= 1
+        end
       end
-      opts.on "-2", '--256', 'Try to display image as 256-colored text' do
-        @actions << :ansi256
+
+      if (argv = optparser.parse(@argv)).empty?
+        puts optparser.help
+        return
       end
-      opts.on "-W", '--wide', 'Use 2 horizontal characters per one pixel' do
-        @options[:wide] = true
+
+      @actions = DEFAULT_ACTIONS if @actions.empty?
+
+      argv.each_with_index do |fname,idx|
+        if argv.size > 1 && @options[:verbose] >= 0
+          puts if idx > 0
+          puts "[.] #{fname}".color(:green)
+        end
+        @file_idx  = idx
+        @file_name = fname
+
+        @zpng = load_file fname
+
+        @actions.each do |action|
+          if action.is_a?(Array)
+            self.send(*action) if self.respond_to?(action.first)
+          else
+            self.send(action) if self.respond_to?(action)
+          end
+        end
       end
+    rescue Errno::EPIPE
+      # output interrupt, f.ex. when piping output to a 'head' command
+      # prevents a 'Broken pipe - <STDOUT> (Errno::EPIPE)' message
     end
 
-    if (argv = optparser.parse(@argv)).empty?
-      puts optparser.help
-      return
+    def extract_chunk id
+      @img.chunks.each do |chunk|
+        if chunk.idx == id
+          case chunk
+          when Chunk::ZTXT
+            print chunk.text
+          else
+            print chunk.data
+          end
+        end
+      end
     end
 
-    @actions = DEFAULT_ACTIONS if @actions.empty?
+    def unpack_imagedata
+      print @img.imagedata
+    end
 
-    argv.each_with_index do |fname,idx|
-      if argv.size > 1 && @options[:verbose] >= 0
-        puts if idx > 0
-        puts "[.] #{fname}".color(:green)
+    def crop geometry
+      unless geometry =~ /\A(\d+)x(\d+)\+(\d+)\+(\d+)\Z/i
+        STDERR.puts "[!] invalid geometry #{geometry.inspect}, must be WxH+X+Y, like 100x100+10+10"
+        exit 1
       end
-      @file_idx  = idx
-      @file_name = fname
+      @img.crop! :width => $1.to_i, :height => $2.to_i, :x => $3.to_i, :y => $4.to_i
+      print @img.export unless @actions.include?(:ascii)
+    end
 
-      @zpng = load_file fname
+    def load_file fname
+      @img = Image.load fname
+    end
 
-      @actions.each do |action|
-        if action.is_a?(Array)
-          self.send(*action) if self.respond_to?(action.first)
+    def metadata
+      return if @img.metadata.empty?
+      puts "[.] metadata:"
+      @img.metadata.each do |k,v,h|
+        if h.keys.sort == [:keyword, :text]
+          v.gsub!(/[\n\r]+/, "\n"+" "*18)
+          printf "    %-11s : %s\n", k, v.gray
         else
-          self.send(action) if self.respond_to?(action)
+          printf "    %s (%s: %s):", k, h[:language], h[:translated_keyword]
+          v.gsub!(/[\n\r]+/, "\n"+" "*18)
+          printf "\n%s%s\n", " "*18, v.gray
         end
       end
+      puts
     end
-  rescue Errno::EPIPE
-    # output interrupt, f.ex. when piping output to a 'head' command
-    # prevents a 'Broken pipe - <STDOUT> (Errno::EPIPE)' message
-  end
 
-  def extract_chunk id
-    @img.chunks.each do |chunk|
-      if chunk.idx == id
-        case chunk
-        when ZPNG::Chunk::ZTXT
-          print chunk.text
-        else
-          print chunk.data
-        end
+    def info
+      color = %w'COLOR_GRAYSCALE COLOR_RGB COLOR_INDEXED COLOR_GRAY_ALPHA COLOR_RGBA'.find do |k|
+        @img.hdr.color == ZPNG.const_get(k)
       end
+      puts "[.] image size #{@img.width || '?'}x#{@img.height || '?'}, #{@img.bpp}bpp, #{color}"
+      puts "[.] palette = #{@img.palette}" if @img.palette
+      puts "[.] uncompressed imagedata size = #{@img.imagedata.size} bytes"
+      _conditional_hexdump @img.imagedata, 3
     end
-  end
 
-  def unpack_imagedata
-    print @img.imagedata
-  end
+    def _conditional_hexdump data, v2 = 2
+      if @options[:verbose] <= 0
+        # do nothing
+      elsif @options[:verbose] < v2
+        sz = 0x20
+        print Hexdump.dump(data[0,sz],
+                          :show_offset => false,
+                          :tail => data.size > sz ? " + #{data.size-sz} bytes\n" : "\n"
+                         ){ |row| row.insert(0,"    ") }.gray
+        puts
 
-  def crop geometry
-    unless geometry =~ /\A(\d+)x(\d+)\+(\d+)\+(\d+)\Z/i
-      STDERR.puts "[!] invalid geometry #{geometry.inspect}, must be WxH+X+Y, like 100x100+10+10"
-      exit 1
+      elsif @options[:verbose] >= v2
+        print Hexdump.dump(data){ |row| row.insert(0,"    ") }.gray
+        puts
+      end
     end
-    @img.crop! :width => $1.to_i, :height => $2.to_i, :x => $3.to_i, :y => $4.to_i
-    print @img.export unless @actions.include?(:ascii)
-  end
-
-  def load_file fname
-    @img = ZPNG::Image.new fname
-  end
-
-  def info
-    puts "[.] image size #{@img.width || '?'}x#{@img.height || '?'}, bpp=#{@img.bpp}"
-    puts "[.] uncompressed imagedata size = #{@img.imagedata.size} bytes"
-    puts "[.] palette = #{@img.palette}" if @img.palette
-  end
 
-  def chunks
-    @img.dump
-  end
+    def chunks idx=nil
+      @img.chunks.each do |chunk|
+        next if idx && chunk.idx != idx
+        colored_type = chunk.type.magenta
+        colored_crc  = chunk.crc_ok? ? 'CRC OK'.green : 'CRC ERROR'.red
+        puts "[.] #{chunk.inspect(@options[:verbose]).sub(chunk.type, colored_type)} #{colored_crc}"
 
-  def ascii
-    @img.height.times do |y|
-      @img.width.times do |x|
-        c = @img[x,y].to_ascii
-        c *= 2 if @options[:wide]
-        print c
+        _conditional_hexdump(chunk.data) unless chunk.size == 0
       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].to_ansi)
+    def ascii
+      @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
-      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_html)
+    def ansi
+      spc = @options[:wide] ? "  " : " "
+      @img.height.times do |y|
+        @img.width.times do |x|
+          print spc.background(@img[x,y].to_ansi)
+        end
+        puts
       end
-      puts
     end
-  end
 
-  def scanlines
-    @img.scanlines.each do |sl|
-      p sl
-      case @options[:verbose]
-      when 1
-        Hexdump.dump(sl.raw_data)
-      when 2
-        Hexdump.dump(sl.decoded_bytes)
-      when 3..999
-        Hexdump.dump(sl.raw_data)
-        Hexdump.dump(sl.decoded_bytes)
+    def ansi256
+      require 'rainbow'
+      spc = @options[:wide] ? "  " : " "
+      @img.height.times do |y|
+        @img.width.times do |x|
+          print spc.background(@img[x,y].to_html)
+        end
         puts
       end
     end
-  end
 
-  def palette
-    if @img.palette
-      pp @img.palette
-      Hexdump.dump @img.palette.data, :width => 6*3
+    def scanlines
+      @img.scanlines.each do |sl|
+        p sl
+        case @options[:verbose]
+        when 1
+          hexdump(sl.raw_data)
+        when 2
+          hexdump(sl.decoded_bytes)
+        when 3..999
+          hexdump(sl.raw_data)
+          hexdump(sl.decoded_bytes)
+          puts
+        end
+      end
+    end
+
+    def palette
+      if @img.palette
+        pp @img.palette
+        hexdump(@img.palette.data, :width => 3, :show_offset => false) do |row, offset|
+          row.insert(0,"  color %4s:  " % "##{(offset/3)}")
+        end
+      end
     end
   end
 end