zpng 0.2.1 → 0.2.2

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "rspec",   ">= 2.8.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.8.4"
+  gem "what_methods"
 end

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       rdoc
     json (1.7.5)
     rainbow (1.1.4)
-    rake (10.0.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.12.0)
@@ -21,6 +21,7 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
+    what_methods (1.0.1)
 
 PLATFORMS
   ruby
@@ -30,3 +31,4 @@ DEPENDENCIES
   jeweler (~> 1.8.4)
   rainbow
   rspec (>= 2.8.0)
+  what_methods

data/README.md

@@ -16,7 +16,6 @@ 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
 -----
@@ -31,6 +30,7 @@ Usage
     
         -S, --scanlines                  Show scanlines info
         -P, --palette                    Show palette
+            --colors                     Show colors used
         -E, --extract-chunk ID           extract a single chunk
         -D, --imagedata                  dump unpacked Image Data (IDAT) chunk(s) to stdout
     
@@ -44,6 +44,7 @@ Usage
     
         -v, --verbose                    Run verbosely (can be used multiple times)
         -q, --quiet                      Silent any warnings (can be used multiple times)
+        -I, --console                    opens IRB console with specified image loaded
 
 ### Info
 
@@ -51,7 +52,7 @@ Usage
 
     [.] 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 #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, interlace=0, width=35> 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
@@ -65,7 +66,7 @@ Usage
         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
+    [.] <Chunk #00 IHDR size=    13, crc=91bb240e, color=2, compression=0, depth=8, filter=0, height=35, idx=0, interlace=0, width=35> CRC OK
         00 00 00 23 00 00 00 23  08 02 00 00 00           |...#...#.....   |
     
     [.] <Chunk #01 sRGB size=     1, crc=aece1ce9 > CRC OK
@@ -83,7 +84,7 @@ Usage
 
     # zpng --chunks qr_aux_chunks.png
 
-    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, width=35, color=0, interlace=0, depth=1, compression=0, height=35, filter=0> CRC OK
+    [.] <Chunk #00 IHDR size=    13, crc=36a28ef4, color=0, compression=0, depth=1, filter=0, height=35, interlace=0, width=35> 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

data/README.md.tpl

@@ -16,7 +16,6 @@ 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
 -----

data/TODO

@@ -1,3 +1,6 @@
+[ ] benchmark accessing very last PNG scanline
+[ ] use iostruct
+
 ways to hide info in PNG:
  * IHDR: longer than 13 bytes
  * IEND:
@@ -6,11 +9,13 @@ ways to hide info in PNG:
  * TEXT chunks
  * zTXT chunks
     * comp_method
+    * data after compressed data?
  * IDAT:
     * data after last scanline
     * last bits in scanline when bpp%8 != 0
  * PLTE:
     * raw letters
     * stegano
+    * many palette entries with same color => visually same pixels but, different color idx
  * custom chunks
  * crc

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/zpng.rb

@@ -1,16 +1,26 @@
 require 'zlib'
 require 'stringio'
 
+module ZPNG
+  class Exception < ::StandardError; end
+  class NotSupported  < Exception; end
+  class ArgumentError < Exception; end
+end
+
 require 'zpng/string_ext'
 require 'zpng/deep_copyable'
 
 require 'zpng/color'
 require 'zpng/block'
 require 'zpng/scan_line'
+require 'zpng/scan_line/mixins'
 require 'zpng/chunk'
 require 'zpng/text_chunk'
-require 'zpng/image'
+require 'zpng/readable_struct'
 require 'zpng/adam7_decoder'
 require 'zpng/hexdump'
 require 'zpng/metadata'
 require 'zpng/pixels'
+
+require 'zpng/bmp/reader'
+require 'zpng/image'

data/lib/zpng/bmp/reader.rb

@@ -0,0 +1,105 @@
+module ZPNG
+  module BMP
+    class BITMAPINFOHEADER < ReadableStruct.new 'V3v2V6',
+      :biSize,          # BITMAPINFOHEADER::SIZE
+      :biWidth,
+      :biHeight,
+      :biPlanes,
+      :biBitCount,
+      :biCompression,
+      :biSizeImage,
+      :biXPelsPerMeter,
+      :biYPelsPerMeter,
+      :biClrUsed,
+      :biClrImportant
+
+      def inspect
+        "<" + super.partition(self.class.to_s.split('::').last)[1..-1].join
+      end
+    end
+
+    class BmpHdrPseudoChunk < Chunk::IHDR
+      def initialize bmp_hdr
+        @bmp_hdr = bmp_hdr
+        super(
+          :width   => bmp_hdr.biWidth,
+          :height  => bmp_hdr.biHeight.abs,
+          :bpp     => bmp_hdr.biBitCount,
+          :type    => 'BITMAPINFOHEADER',
+          :crc     => :no_crc               # for CLI
+        )
+      end
+      def inspect *args
+        @bmp_hdr.inspect
+      end
+      def method_missing mname, *args
+        if @bmp_hdr.respond_to?(mname)
+          @bmp_hdr.send(mname,*args)
+        else
+          super
+        end
+      end
+    end
+
+    class Color < ZPNG::Color
+      # BMP pixels are in perverted^w reverted order - BGR instead of RGB
+      def initialize *a
+        h = a.last.is_a?(Hash) ? a.pop : {}
+        case a.size
+        when 3
+          # BGR
+          super *a.reverse, h
+        when 4
+          # ABGR
+          super a[2], a[1], a[0], a[3], h
+        else
+          super
+        end
+      end
+    end
+
+    module ImageMixin
+      def imagedata
+        @imagedata ||= @scanlines.sort_by(&:offset).map(&:decoded_bytes).join
+      end
+    end
+
+    module Reader
+      # http://en.wikipedia.org/wiki/BMP_file_format
+
+      def _read_bmp io
+        filesize, reserved1, reserved2, imagedata_offset = io.read(4+2+2+4).unpack('VvvV')
+        # DIB Header immediately follows the Bitmap File Header
+        hdr = BITMAPINFOHEADER.read(io)
+        if hdr.biSize != BITMAPINFOHEADER::SIZE
+          raise "dib_hdr_size #{hdr.biSize} unsupported, want #{BITMAPINFOHEADER::SIZE}"
+        end
+
+        @new_image = true
+        @color_class = BMP::Color
+        @format = :bmp
+        @chunks << BmpHdrPseudoChunk.new(hdr)
+
+        # http://en.wikipedia.org/wiki/BMP_file_format#Pixel_storage
+        row_size = ((hdr.biBitCount*self.width+31)/32)*4
+        # XXX hidden data in non-significant tail bits/bytes
+
+        io.seek(imagedata_offset)
+
+        @scanlines = []
+        self.height.times do |idx|
+          offset = io.tell - imagedata_offset
+          data = io.read(row_size)
+          # BMP scanlines layout is upside-down
+          @scanlines.unshift ScanLine.new(self, self.height-idx-1,
+                                          :decoded_bytes => data,
+                                          :size   => row_size,
+                                          :offset => offset
+                                         )
+        end
+
+        extend ImageMixin
+      end
+    end # Reader
+  end # BMP
+end # ZPNG

data/lib/zpng/chunk.rb

@@ -45,7 +45,7 @@ module ZPNG
     def export
       @data = self.export_data # virtual
       @size = @data.size # XXX hmm.. is it always is?
-      @crc = Zlib.crc32(data, Zlib.crc32(type))
+      fix_crc!
       [@size,@type].pack('Na4') + @data + [@crc].pack('N')
     end
 
@@ -66,6 +66,10 @@ module ZPNG
       expected_crc == crc
     end
 
+    def fix_crc!
+      @crc = Zlib.crc32(data, Zlib.crc32(type))
+    end
+
     class IHDR < Chunk
       attr_accessor :width, :height, :depth, :color, :compression, :filter, :interlace
 
@@ -184,7 +188,7 @@ module ZPNG
         vars = instance_variables - [:@type, :@crc, :@data, :@size]
         vars -= [:@idx] if verbosity <= 0
         super.sub(/ *>$/,'') + ", " +
-          vars.map{ |var| "#{var.to_s.tr('@','')}=#{instance_variable_get(var)}" }.
+          vars.sort.map{ |var| "#{var.to_s.tr('@','')}=#{instance_variable_get(var)}" }.
           join(", ") + ">"
       end
     end

data/lib/zpng/cli.rb

@@ -37,6 +37,7 @@ module ZPNG
         opts.separator ""
         opts.on("-S", "--scanlines", "Show scanlines info"){ @actions << :scanlines }
         opts.on("-P", "--palette", "Show palette"){ @actions << :palette }
+        opts.on(      "--colors", "Show colors used"){ @actions << :colors }
 
         opts.on "-E", "--extract-chunk ID", Integer, "extract a single chunk" do |id|
           @actions << [:extract_chunk, id]
@@ -72,6 +73,9 @@ module ZPNG
         opts.on "-q", "--quiet", "Silent any warnings (can be used multiple times)" do |v|
           @options[:verbose] -= 1
         end
+        opts.on "-I", "--console", "opens IRB console with specified image loaded" do |v|
+          @actions << :console
+        end
       end
 
       if (argv = optparser.parse(@argv)).empty?
@@ -86,8 +90,7 @@ module ZPNG
           puts if idx > 0
           puts "[.] #{fname}".color(:green)
         end
-        @file_idx  = idx
-        @file_name = fname
+        @fname = fname
 
         @zpng = load_file fname
 
@@ -131,20 +134,30 @@ module ZPNG
     end
 
     def load_file fname
-      @img = Image.load fname
+      @img = Image.load fname, :verbose => true
     end
 
     def metadata
       return if @img.metadata.empty?
       puts "[.] metadata:"
       @img.metadata.each do |k,v,h|
+        if @options[:verbose] < 2
+          if k.size > 512
+            puts "[?] key too long (#{k.size}), truncated to 512 chars".yellow
+            k = k[0,512] + "..."
+          end
+          if v.size > 512
+            puts "[?] value too long (#{v.size}), truncated to 512 chars".yellow
+            v = v[0,512] + "..."
+          end
+        end
         if h.keys.sort == [:keyword, :text]
-          v.gsub!(/[\n\r]+/, "\n"+" "*18)
-          printf "    %-11s : %s\n", k, v.gray
+          v.gsub!(/[\n\r]+/, "\n"+" "*19)
+          printf "    %-12s : %s\n", k, v.gray
         else
           printf "    %s (%s: %s):", k, h[:language], h[:translated_keyword]
-          v.gsub!(/[\n\r]+/, "\n"+" "*18)
-          printf "\n%s%s\n", " "*18, v.gray
+          v.gsub!(/[\n\r]+/, "\n"+" "*19)
+          printf "\n%s%s\n", " "*19, v.gray
         end
       end
       puts
@@ -156,8 +169,8 @@ module ZPNG
       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
+      puts "[.] uncompressed imagedata size = #{@img.imagedata_size} bytes"
+      _conditional_hexdump(@img.imagedata, 3) if @options[:verbose] > 0
     end
 
     def _conditional_hexdump data, v2 = 2
@@ -181,7 +194,14 @@ module ZPNG
       @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
+        colored_crc =
+          if chunk.crc == :no_crc # hack for BMP chunks (they have no CRC)
+            ''
+          elsif chunk.crc_ok?
+            'CRC OK'.green
+          else
+            'CRC ERROR'.red
+          end
         puts "[.] #{chunk.inspect(@options[:verbose]).sub(chunk.type, colored_type)} #{colored_crc}"
 
         _conditional_hexdump(chunk.data) unless chunk.size == 0
@@ -225,11 +245,11 @@ module ZPNG
         p sl
         case @options[:verbose]
         when 1
-          hexdump(sl.raw_data)
+          hexdump(sl.raw_data) if sl.raw_data
         when 2
           hexdump(sl.decoded_bytes)
         when 3..999
-          hexdump(sl.raw_data)
+          hexdump(sl.raw_data) if sl.raw_data
           hexdump(sl.decoded_bytes)
           puts
         end
@@ -244,5 +264,51 @@ module ZPNG
         end
       end
     end
+
+    def colors
+      h=Hash.new(0)
+      h2=Hash.new{ |k,v| k[v] = [] }
+      @img.each_pixel do |c,x,y|
+        h[c] += 1
+        if h[c] < 6
+          h2[c] << [x,y]
+        end
+      end
+
+      xlen = @img.width.to_s.size
+      ylen = @img.height.to_s.size
+
+      h.sort_by{ |c,n| [n] + h2[c].first.reverse }.each do |c,n|
+        printf "%6d : %s : ", n, c.inspect
+        h2[c].each_with_index do |a,idx|
+          print ";" if idx > 0
+          if idx >= 4
+            print " ..."
+            break
+          end
+          printf " %*d,%*d", xlen, a[0], ylen, a[1]
+        end
+        puts
+      end
+    end
+
+    def console
+      ARGV.clear # clear ARGV so IRB is not confused
+      require 'irb'
+      m0 = IRB.method(:setup)
+      img = @img
+
+      # override IRB.setup, called from IRB.start
+      IRB.define_singleton_method :setup do |*args|
+        m0.call *args
+        conf[:IRB_RC] = Proc.new do |context|
+          context.main.instance_variable_set '@img', img
+          context.main.define_singleton_method(:img){ @img }
+        end
+      end
+
+      puts "[.] img = ZPNG::Image.load(#{@fname.inspect})".gray
+      IRB.start
+    end
   end
 end

data/lib/zpng/image.rb

@@ -1,38 +1,71 @@
+require 'stringio'
+
 module ZPNG
   class Image
-    attr_accessor :data, :header, :chunks, :scanlines, :imagedata
-    alias :hdr :header
+    attr_accessor :chunks, :scanlines, :imagedata, :extradata, :format, :verbose
+
+    # now only for (limited) BMP support
+    attr_accessor :color_class
 
     include DeepCopyable
+    include BMP::Reader
 
-    PNG_HDR = "\x89PNG\x0d\x0a\x1a\x0a"
+    PNG_HDR = "\x89PNG\x0d\x0a\x1a\x0a".force_encoding('binary')
+    BMP_HDR = "BM".force_encoding('binary')
 
-    def initialize x
+    # possible input params:
+    #   IO      of opened image file
+    #   String  with image file already readed
+    #   Hash    of image parameters to create new blank image
+    def initialize x, h={}
       @chunks = []
+      @color_class = Color
+      @format = :png
+      @verbose =
+        case h[:verbose]
+        when true;  1
+        when false; 0
+        else h[:verbose].to_i
+        end
+
       case x
         when IO
-          _from_string x.read
+          _from_io x
         when String
-          _from_string x
+          _from_io StringIO.new(x)
         when Hash
           _from_hash x
         else
-          raise "unsupported input data type #{x.class}"
+          raise NotSupported, "unsupported input data type #{x.class}"
       end
       if palette && hdr && hdr.depth
         palette.max_colors = 2**hdr.depth
       end
     end
 
+    def inspect
+      "#<ZPNG::Image " +
+      %w'width height bpp chunks scanlines'.map do |k|
+        v = case (v = send(k))
+          when Array
+            "[#{v.size} entries]"
+          when String
+            v.size > 40 ? "[#{v.bytesize} bytes]" : v.inspect
+          else v.inspect
+        end
+        "#{k}=#{v}"
+      end.compact.join(", ") + ">"
+    end
+
     def adam7
       @adam7 ||= Adam7Decoder.new(self)
     end
 
     class << self
       # load image from file
-      def load fname
+      def load fname, h={}
         open(fname,"rb") do |f|
-          self.new(f)
+          self.new(f,h)
         end
       end
       alias :load_file :load
@@ -55,8 +88,8 @@ module ZPNG
 
     def _from_hash h
       @new_image = true
-      @chunks << (@header = Chunk::IHDR.new(h))
-      if @header.palette_used?
+      @chunks << Chunk::IHDR.new(h)
+      if header.palette_used?
         if h.key?(:palette)
           if h[:palette]
             @chunks << h[:palette]
@@ -71,41 +104,36 @@ module ZPNG
       end
     end
 
-    def _from_string x
-      if x
-        if PNG_HDR.size.times.all?{ |i| x[i].ord == PNG_HDR[i].ord } # encoding error workaround
-          # raw image data
-          @data = x
-        elsif File.exist?(x)
-          # filename
-          @data = File.binread(x)
-        else
-          raise "Don't know what #{x.inspect} is"
-        end
-      end
-
-      d = data[0,PNG_HDR.size]
-      if d != PNG_HDR
-        puts "[!] first #{PNG_HDR.size} bytes must be #{PNG_HDR.inspect}, but got #{d.inspect}".red
-      end
-
-      io = StringIO.new(data)
-      io.seek PNG_HDR.size
+    def _read_png io
       while !io.eof?
         chunk = Chunk.from_stream(io)
         chunk.idx = @chunks.size
         @chunks << chunk
-        case chunk
-        when Chunk::IHDR
-          @header = chunk
-        when Chunk::IEND
-          break
+        break if chunk.is_a?(Chunk::IEND)
+      end
+    end
+
+    def _from_io io
+      # Puts ios into binary mode.
+      # Once a stream is in binary mode, it cannot be reset to nonbinary mode.
+      io.binmode
+
+      hdr = io.read(BMP_HDR.size)
+      if hdr == BMP_HDR
+        _read_bmp io
+      else
+        hdr << io.read(PNG_HDR.size - BMP_HDR.size)
+        if hdr == PNG_HDR
+          _read_png io
+        else
+          raise NotSupported, "Unsupported header #{hdr.inspect} in #{io.inspect}"
         end
       end
+
       unless io.eof?
-        offset    = io.tell
-        extradata = io.read
-        puts "[?] #{extradata.size} bytes of extra data after image end (IEND), offset = 0x#{offset.to_s(16)}".red
+        offset     = io.tell
+        @extradata = io.read
+        puts "[?] #{@extradata.size} bytes of extra data after image end (IEND), offset = 0x#{offset.to_s(16)}".red if @verbose >= 1
       end
     end
 
@@ -138,7 +166,7 @@ module ZPNG
           a = trns.data.unpack('n3').map{ |v| v & (2**hdr.depth-1) }
           Color.new(*a, :depth => hdr.depth)
         else
-          raise "color2alpha only intended for GRAYSCALE & RGB color modes"
+          raise Exception, "color2alpha only intended for GRAYSCALE & RGB color modes"
         end
 
       color == @alpha_color ? 0 : (2**hdr.depth-1)
@@ -149,6 +177,12 @@ module ZPNG
     ###########################################################################
     # chunks access
 
+    def ihdr
+      @ihdr ||= @chunks.find{ |c| c.is_a?(Chunk::IHDR) }
+    end
+    alias :header :ihdr
+    alias :hdr :ihdr
+
     def trns
       # not used "@trns ||= ..." here b/c it will call find() each time of there's no TRNS chunk
       defined?(@trns) ? @trns : (@trns=@chunks.find{ |c| c.is_a?(Chunk::TRNS) })
@@ -163,51 +197,119 @@ module ZPNG
     # image attributes
 
     def bpp
-      @header && @header.bpp
+      ihdr && @ihdr.bpp
     end
 
     def width
-      @header && @header.width
+      ihdr && @ihdr.width
     end
 
     def height
-      @header && @header.height
+      ihdr && @ihdr.height
     end
 
     def grayscale?
-      @header && @header.grayscale?
+      ihdr && @ihdr.grayscale?
     end
 
     def interlaced?
-      @header && @header.interlace != 0
+      ihdr && @ihdr.interlace != 0
     end
 
     def alpha_used?
-      @header && @header.alpha_used?
+      ihdr && @ihdr.alpha_used?
+    end
+
+    private
+    def _imagedata
+      data_chunks = @chunks.find_all{ |c| c.is_a?(Chunk::IDAT) }
+      case data_chunks.size
+      when 0
+        # no imagedata chunks ?!
+        nil
+      when 1
+        # a single chunk - save memory and return a reference to its data
+        data_chunks[0].data
+      else
+        # multiple data chunks - join their contents
+        data_chunks.map(&:data).join
+      end
     end
+    public
 
     def imagedata
       @imagedata ||=
         begin
-          puts "[?] no image header, assuming non-interlaced RGB".yellow unless @header
-          data = @chunks.find_all{ |c| c.is_a?(Chunk::IDAT) }.map(&:data).join
+          puts "[?] no image header, assuming non-interlaced RGB".yellow unless header
+          data = _imagedata
+          #check_zlib_extradata data
           (data && data.size > 0) ? Zlib::Inflate.inflate(data) : ''
         end
     end
 
+    def imagedata_size
+      if new_image?
+        @scanlines.map(&:size).inject(&:+)
+      else
+        imagedata.size
+      end
+    end
+
+#    # check for extradata in zlib datastream after the end of compressed stream
+#    def check_zlib_extradata data
+#      zi = Zlib::Inflate.new(Zlib::MAX_WBITS)
+#      io = StringIO.new(data)
+#      while !io.eof? && !zi.finished?
+#        zi.inflate(io.read(16384))
+#      end
+#      zi.finish unless zi.finished?
+#      if data.size != zi.total_in
+#        p [data.size, zi.total_in, zi.total_out]
+#        raise
+#      end
+#      zi.close if zi && !zi.closed?
+#    end
+
+#    # try to get imagedata size in bytes, w/o storing entire decompressed
+#    # stream in memory. used in bin/zpng
+#    # result: less memory used on big images, but speed gain near 1-2% in best case,
+#    #         and 2x slower in worst case because imagedata decoded 2 times
+#    def imagedata_size
+#      if @imagedata
+#        # already decompressed
+#        @imagedata.size
+#      else
+#        zi = nil
+#        @imagedata_size ||=
+#          begin
+#            zi = Zlib::Inflate.new(Zlib::MAX_WBITS)
+#            io = StringIO.new(_imagedata)
+#            while !io.eof? && !zi.finished?
+#              n = zi.inflate(io.read(16384))
+#            end
+#            zi.finish unless zi.finished?
+#            zi.total_out
+#          ensure
+#            zi.close if zi && !zi.closed?
+#          end
+#      end
+#    end
+
     def metadata
       @metadata ||= Metadata.new(self)
     end
 
     def [] x, y
+      # extracting this check into a module => +1-2% speed
       x,y = adam7.convert_coords(x,y) if interlaced?
       scanlines[y][x]
     end
 
-    def []= x, y, newpixel
+    def []= x, y, newcolor
+      # extracting these checks into a module => +1-2% speed
       decode_all_scanlines
       x,y = adam7.convert_coords(x,y) if interlaced?
-      scanlines[y][x] = newpixel
+      scanlines[y][x] = newcolor
     end
 
     # we must decode all scanlines before doing any modifications
@@ -261,16 +363,16 @@ module ZPNG
     end
 
     def export
-      # fill @imagedata, if not already filled
-      imagedata unless new_image?
+      # XXX creating new IDAT must be BEFORE deleting old IDAT chunks
+      idat = Chunk::IDAT.new(
+        :data => Zlib::Deflate.deflate(scanlines.map(&:export).join, 9)
+      )
 
       # delete old IDAT chunks
       @chunks.delete_if{ |c| c.is_a?(Chunk::IDAT) }
 
-      # fill first_idat @data with compressed imagedata
-      @chunks << Chunk::IDAT.new(
-        :data => Zlib::Deflate.deflate(scanlines.map(&:export).join, 9)
-      )
+      # add newly created IDAT
+      @chunks << idat
 
       # delete IEND chunk(s) b/c we just added a new chunk and IEND must be the last one
       @chunks.delete_if{ |c| c.is_a?(Chunk::IEND) }
@@ -286,12 +388,12 @@ module ZPNG
       decode_all_scanlines
 
       x,y,h,w = (params[:x]||0), (params[:y]||0), params[:height], params[:width]
-      raise "negative params not allowed" if [x,y,h,w].any?{ |x| x < 0 }
+      raise ArgumentError, "negative params not allowed" if [x,y,h,w].any?{ |x| x < 0 }
 
       # adjust crop sizes if they greater than image sizes
       h = self.height-y if (y+h) > self.height
       w = self.width-x if (x+w) > self.width
-      raise "negative params not allowed (p2)" if [x,y,h,w].any?{ |x| x < 0 }
+      raise ArgumentError, "negative params not allowed (p2)" if [x,y,h,w].any?{ |x| x < 0 }
 
       # delete excess scanlines at tail
       scanlines[(y+h)..-1] = [] if (y+h) < scanlines.size
@@ -321,9 +423,13 @@ module ZPNG
     end
 
     def == other_image
-      width  == other_image.width &&
-      height == other_image.height &&
-      pixels == other_image.pixels
+      return false unless other_image.is_a?(Image)
+      return false if width  != other_image.width
+      return false if height != other_image.height
+      each_pixel do |c,x,y|
+        return false if c != other_image[x,y]
+      end
+      true
     end
 
     def each_pixel &block