zpng 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/zpng/bmp/reader.rb

@@ -1,5 +1,18 @@
 module ZPNG
   module BMP
+
+    class BITMAPFILEHEADER < ReadableStruct.new 'VvvV', #a2VvvV',
+      #:bfType,
+      :bfSize,      # the size of the BMP file in bytes
+      :bfReserved1,
+      :bfReserved2,
+      :bfOffBits    # imagedata offset
+
+      def inspect
+        "<" + super.partition(self.class.to_s.split('::').last)[1..-1].join
+      end
+    end
+
     class BITMAPINFOHEADER < ReadableStruct.new 'V3v2V6',
       :biSize,          # BITMAPINFOHEADER::SIZE
       :biWidth,
@@ -21,13 +34,20 @@ module ZPNG
     class BmpHdrPseudoChunk < Chunk::IHDR
       def initialize bmp_hdr
         @bmp_hdr = bmp_hdr
-        super(
+        h = {
           :width   => bmp_hdr.biWidth,
           :height  => bmp_hdr.biHeight.abs,
-          :bpp     => bmp_hdr.biBitCount,
           :type    => 'BITMAPINFOHEADER',
           :crc     => :no_crc               # for CLI
-        )
+        }
+        if bmp_hdr.biBitCount == 8
+          h[:color] = COLOR_INDEXED
+          h[:depth] = 8
+        else
+          h[:bpp] = bmp_hdr.biBitCount
+        end
+        super(h)
+        self.data = bmp_hdr.pack
       end
       def inspect *args
         @bmp_hdr.inspect
@@ -41,6 +61,73 @@ module ZPNG
       end
     end
 
+    class TypedBlock < Struct.new(:type, :size, :offset, :data)
+      def inspect
+        # string length of 16 is for alignment with BITMAP....HEADER chunks on
+        # zpng CLI output
+        "<%s size=%-5d (0x%-4x) offset=%-5d (0x%-4x)>" %
+          [type, size, size, offset, offset]
+      end
+      def pack; data; end
+    end
+
+    class BmpPseudoChunk < Chunk
+      def initialize struct
+        @struct = struct
+        type =
+          if struct.respond_to?(:type)
+            struct.type
+          else
+            struct.class.to_s.split('::').last
+          end
+
+        super(
+          #:size    => struct.class.const_get('SIZE'),
+          :type    => type,
+          :data    => struct.pack,
+          :crc     => :no_crc               # for CLI
+        )
+      end
+      def inspect *args
+        @struct.inspect
+      end
+      def method_missing mname, *args
+        if @struct.respond_to?(mname)
+          @struct.send(mname,*args)
+        else
+          super
+        end
+      end
+    end
+
+    class BmpPaletteChunk < Chunk::PLTE
+      def initialize data
+        super(
+          :crc  => :no_crc,
+          :data => data,
+          :type => 'PALETTE'
+        )
+      end
+
+      def [] idx
+        rgbx = @data[idx*4,4]
+        rgbx && Color.new(*rgbx.unpack('C4'))
+      end
+
+      def []= idx, color
+        @data ||= ''
+        @data[idx*4,4] = [color.r, color.g, color.b, color.a].pack('C4')
+      end
+
+      def ncolors
+        @data.to_s.size/4
+      end
+
+      def inspect *args
+        "<%s ncolors=%d>" % ["PALETTE", size/4]
+      end
+    end
+
     class Color < ZPNG::Color
       # BMP pixels are in perverted^w reverted order - BGR instead of RGB
       def initialize *a
@@ -68,27 +155,44 @@ module ZPNG
       # 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')
+        fhdr = BITMAPFILEHEADER.read(io)
         # 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}"
+        ihdr = BITMAPINFOHEADER.read(io)
+        if ihdr.biSize != BITMAPINFOHEADER::SIZE
+          raise "dib_hdr_size #{ihdr.biSize} unsupported, want #{BITMAPINFOHEADER::SIZE}"
         end
 
         @new_image = true
         @color_class = BMP::Color
         @format = :bmp
-        @chunks << BmpHdrPseudoChunk.new(hdr)
+        @chunks << BmpPseudoChunk.new(fhdr)
+        @chunks << BmpHdrPseudoChunk.new(ihdr)
 
         # 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
+        row_size = ((ihdr.biBitCount*self.width+31)/32)*4
 
-        io.seek(imagedata_offset)
+        gap1_size = fhdr.bfOffBits - io.tell
+
+        STDERR.puts "[?] negative gap1=#{gap1_size}".red if gap1_size < 0
+
+        if ihdr.biBitCount == 8 && gap1_size >= 1024
+          # palette for 256-color BMP
+          data = io.read 1024
+          @chunks << BmpPaletteChunk.new(data)
+          gap1_size -= 1024
+        end
 
+        if gap1_size != 0
+          @chunks << BmpPseudoChunk.new(
+            TypedBlock.new("GAP1", gap1_size, io.tell, io.read(gap1_size))
+          )
+          #io.seek(fhdr.bfOffBits)
+        end
+
+        pos0 = io.tell
         @scanlines = []
         self.height.times do |idx|
-          offset = io.tell - imagedata_offset
+          offset = io.tell - fhdr.bfOffBits
           data = io.read(row_size)
           # BMP scanlines layout is upside-down
           @scanlines.unshift ScanLine.new(self, self.height-idx-1,
@@ -98,6 +202,16 @@ module ZPNG
                                          )
         end
 
+        @chunks << BmpPseudoChunk.new(
+            TypedBlock.new("IMAGEDATA", io.tell - pos0, pos0, '')
+        )
+
+        unless io.eof?
+          @chunks << BmpPseudoChunk.new(
+            TypedBlock.new("GAP2", io.size - io.tell, io.tell, '')
+          )
+        end
+
         extend ImageMixin
       end
     end # Reader

data/lib/zpng/chunk.rb

@@ -210,6 +210,25 @@ module ZPNG
         @data.to_s.size/3
       end
 
+      # colors enumerator
+      def each
+        ncolors.times do |i|
+          yield self[i]
+        end
+      end
+
+      # colors enumerator with index
+      def each_with_index
+        ncolors.times do |i|
+          yield self[i], i
+        end
+      end
+
+      # convert to array of colors
+      def to_a
+        ncolors.times.map{ |i| self[i] }
+      end
+
       def index color
         ncolors.times do |i|
           c = self[i]

data/lib/zpng/cli.rb

@@ -134,7 +134,7 @@ module ZPNG
     end
 
     def load_file fname
-      @img = Image.load fname, :verbose => true
+      @img = Image.load fname, :verbose => @options[:verbose]+1
     end
 
     def metadata
@@ -191,9 +191,14 @@ module ZPNG
     end
 
     def chunks idx=nil
+      max_type_len = 0
+      unless idx
+        max_type_len = @img.chunks.map{ |x| x.type.to_s.size }.max
+      end
+
       @img.chunks.each do |chunk|
         next if idx && chunk.idx != idx
-        colored_type = chunk.type.magenta
+        colored_type = chunk.type.ljust(max_type_len).magenta
         colored_crc =
           if chunk.crc == :no_crc # hack for BMP chunks (they have no CRC)
             ''
@@ -259,8 +264,14 @@ module ZPNG
     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)}")
+        if @img.format == :bmp
+          hexdump(@img.palette.data, :width => 4, :show_offset => false) do |row, offset|
+            row.insert(0,"  color %4s:  " % "##{(offset/4)}")
+          end
+        else
+          hexdump(@img.palette.data, :width => 3, :show_offset => false) do |row, offset|
+            row.insert(0,"  color %4s:  " % "##{(offset/3)}")
+          end
         end
       end
     end

data/lib/zpng/color.rb

@@ -14,7 +14,7 @@ module ZPNG
       @depth       = h[:depth]       || 8
 
       # default ALPHA = 0xff - opaque
-      @a ||= h[:alpha] || (2**@depth-1)
+      @a ||= h[:alpha] || h[:a] || (2**@depth-1)
     end
 
     def a= a
@@ -88,12 +88,30 @@ module ZPNG
       [to_grayscale, alpha]
     end
 
-    # from_grayscale level
-    # from_grayscale level,        :depth => 16
-    # from_grayscale level, alpha
-    # from_grayscale level, alpha, :depth => 16
-    def self.from_grayscale value, *args
-      Color.new value,value,value, *args
+    class << self
+      # from_grayscale level
+      # from_grayscale level,        :depth => 16
+      # from_grayscale level, alpha
+      # from_grayscale level, alpha, :depth => 16
+      def from_grayscale value, *args
+        Color.new value,value,value, *args
+      end
+
+      # value: (String) "#ff00ff", "#f0f", "f0f", "eebbcc"
+      # alpha can be set via :alpha => N optional hash argument
+      def from_html value, *args
+        s = value.tr('#','')
+        case s.size
+        when 3
+          r,g,b = s.split('').map{ |x| x.to_i(16)*17 }
+        when 6
+          r,g,b = s.scan(/../).map{ |x| x.to_i(16) }
+        else
+          raise ArgumentError, "invalid HTML color #{s}"
+        end
+        Color.new r,g,b, *args
+      end
+      alias :from_css :from_html
     end
 
     ########################################################
@@ -198,6 +216,53 @@ module ZPNG
       r == 0 ? (c1.to_a <=> c2.to_a) : r
     end
 
+    # subtract other color from this one, returns new Color
+    def - c
+      op :-, c
+    end
+
+    # add other color to this one, returns new Color
+    def + c
+      op :+, c
+    end
+
+    # XOR this color with other one, returns new Color
+    def ^ c
+      op :^, c
+    end
+
+    # AND this color with other one, returns new Color
+    def & c
+      op :&, c
+    end
+
+    # OR this color with other one, returns new Color
+    def | c
+      op :|, c
+    end
+
+    # Op! op! op! Op!! Oppan Gangnam Style!!
+    def op op, c=nil
+      # XXX what to do with alpha?
+      max = 2**depth-1
+      if c
+        c = c.to_depth(depth)
+        Color.new(
+          @r.send(op, c.r) & max,
+          @g.send(op, c.g) & max,
+          @b.send(op, c.b) & max,
+          :depth => self.depth
+        )
+      else
+        Color.new(
+          @r.send(op) & max,
+          @g.send(op) & max,
+          @b.send(op) & max,
+          :depth => self.depth
+        )
+      end
+    end
+
     # for Array.uniq()
     def hash
       self.to_i

data/lib/zpng/image.rb

@@ -8,6 +8,9 @@ module ZPNG
     attr_accessor :color_class
 
     include DeepCopyable
+    alias :clone :deep_copy
+    alias :dup   :deep_copy
+
     include BMP::Reader
 
     PNG_HDR = "\x89PNG\x0d\x0a\x1a\x0a".force_encoding('binary')
@@ -19,6 +22,7 @@ module ZPNG
     #   Hash    of image parameters to create new blank image
     def initialize x, h={}
       @chunks = []
+      @extradata = []
       @color_class = Color
       @format = :png
       @verbose =
@@ -73,8 +77,8 @@ module ZPNG
     end
 
     # save image to file
-    def save fname
-      File.open(fname,"wb"){ |f| f << export }
+    def save fname, options={}
+      File.open(fname,"wb"){ |f| f << export(options) }
     end
 
     # flag that image is just created, and NOT loaded from file
@@ -132,8 +136,8 @@ module ZPNG
 
       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 if @verbose >= 1
+        @extradata << io.read
+        puts "[?] #{@extradata.last.size} bytes of extra data after image end (IEND), offset = 0x#{offset.to_s(16)}".red if @verbose >= 1
       end
     end
 
@@ -235,6 +239,50 @@ module ZPNG
         data_chunks.map(&:data).join
       end
     end
+
+    # unpack zlib,
+    # on errors keep going and try to return maximum possible data
+    def _safe_inflate data
+      zi = Zlib::Inflate.new
+      pos = 0; r = ''
+      begin
+        # save some memory by not using String#[] when not necessary
+        r << zi.inflate(pos==0 ? data : data[pos..-1])
+        if zi.total_in < data.size
+          @extradata << data[zi.total_in..-1]
+          puts "[?] #{@extradata.last.size} bytes of extra data after zlib stream".red if @verbose >= 1
+        end
+        # decompress OK
+      rescue Zlib::BufError
+        # tried to decompress, but got EOF - need more data
+        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        # collect any remaining data in decompress buffer
+        r << zi.flush_next_out
+      rescue Zlib::DataError
+        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        #p [pos, zi.total_in, zi.total_out, data.size, r.size]
+        r << zi.flush_next_out
+        # XXX TODO try to skip error and continue
+#        printf "[d] pos=%d/%d t_in=%d t_out=%d bytes_ok=%d\n".gray, pos, data.size,
+#          zi.total_in, zi.total_out, r.size
+#        if pos < zi.total_in
+#          pos = zi.total_in
+#        else
+#          pos += 1
+#        end
+#        pos = 0
+#        retry if pos < data.size
+      rescue Zlib::NeedDict
+        puts "[!] #{$!.inspect}".red if @verbose >= -1
+        # collect any remaining data in decompress buffer
+        r << zi.flush_next_out
+      end
+
+      r == "" ? nil : r
+    ensure
+      zi.close if zi && !zi.closed?
+    end
+
     public
 
     def imagedata
@@ -242,8 +290,7 @@ module ZPNG
         begin
           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) : ''
+          (data && data.size > 0) ? _safe_inflate(data) : ''
         end
     end
 
@@ -255,21 +302,6 @@ module ZPNG
       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,
@@ -362,23 +394,34 @@ module ZPNG
       end
     end
 
-    def export
-      # XXX creating new IDAT must be BEFORE deleting old IDAT chunks
-      idat = Chunk::IDAT.new(
-        :data => Zlib::Deflate.deflate(scanlines.map(&:export).join, 9)
-      )
+    def export options = {}
+      # allow :zlib_level => nil
+      options[:zlib_level] = 9 unless options.key?(:zlib_level)
 
-      # delete old IDAT chunks
-      @chunks.delete_if{ |c| c.is_a?(Chunk::IDAT) }
+      if options.fetch(:repack, true)
+        data = Zlib::Deflate.deflate(scanlines.map(&:export).join, options[:zlib_level])
 
-      # add newly created IDAT
-      @chunks << idat
+        idats = @chunks.find_all{ |c| c.is_a?(Chunk::IDAT) }
+        case idats.size
+        when 0
+          # add new IDAT
+          @chunks << Chunk::IDAT.new( :data => data )
+        when 1
+          idats[0].data = data
+        else
+          idats[0].data = data
+          # delete other IDAT chunks
+          @chunks -= idats[1..-1]
+        end
+      end
 
-      # 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) }
+      unless @chunks.last.is_a?(Chunk::IEND)
+        # delete old IEND chunk(s) b/c IEND must be the last one
+        @chunks.delete_if{ |c| c.is_a?(Chunk::IEND) }
 
-      # add fresh new IEND
-      @chunks << Chunk::IEND.new
+        # add fresh new IEND
+        @chunks << Chunk::IEND.new
+      end
 
       PNG_HDR + @chunks.map(&:export).join
     end

data/lib/zpng/pixels.rb

@@ -10,6 +10,23 @@ module ZPNG
           end
         end
       end
+
+      def keep_if otherwise = Color::TRANSPARENT
+        @image.height.times do |y|
+          @image.width.times do |x|
+            @image[x,y] = otherwise unless yield(@image[x,y])
+          end
+        end
+      end
+
+      def filter!
+        @image.height.times do |y|
+          @image.width.times do |x|
+            @image[x,y] = yield(@image[x,y])
+          end
+        end
+      end
+      alias :map! :filter!
     end
 
     module ScanLineEnum

data/lib/zpng/scan_line.rb

@@ -33,7 +33,7 @@ module ZPNG
           end
         if @filter = image.imagedata[@offset]
           @filter = @filter.ord
-        else
+        elsif @image.verbose >= -1
           STDERR.puts "[!] #{self.class}: ##@idx: no data at pos 0, scanline dropped".red
         end
       end
@@ -235,10 +235,14 @@ module ZPNG
     end
 
     def decoded_bytes
-      #raise if caller.size > 50
       @decoded_bytes ||=
         begin
-          imagedata = @image.imagedata
+          raw = @image.imagedata[@offset+1, size-1]
+          if raw.size < size-1
+            # handle broken images when data ends in the middle of scanline
+            raw += "\x00" * (size-1-raw.size)
+          end
+          # TODO: check if converting raw to array would give any speedup
 
           # number of bytes per complete pixel, rounding up to one
           bpp1 = (@bpp/8.0).ceil
@@ -246,40 +250,38 @@ module ZPNG
           case @filter
 
           when FILTER_NONE    # 0
-            s = imagedata[@offset+1, size-1]
+            s = raw
 
           when FILTER_SUB     # 1
             s = "\x00" * (size-1)
-            s[0,bpp1] = imagedata[@offset+1,bpp1]
+            s[0,bpp1] = raw[0,bpp1] # TODO: optimize
             bpp1.upto(size-2) do |i|
-              s.setbyte(i, imagedata.getbyte(@offset+i+1) + s.getbyte(i-bpp1))
+              s.setbyte(i, raw.getbyte(i) + s.getbyte(i-bpp1))
             end
 
           when FILTER_UP      # 2
             s = "\x00" * (size-1)
             0.upto(size-2) do |i|
-              s.setbyte(i, imagedata.getbyte(@offset+i+1) + prev_scanline_byte(i))
+              s.setbyte(i, raw.getbyte(i) + prev_scanline_byte(i))
             end
 
           when FILTER_AVERAGE # 3
             s = "\x00" * (size-1)
             0.upto(bpp1-1) do |i|
-              s.setbyte(i, imagedata.getbyte(@offset+i+1) + prev_scanline_byte(i)/2)
+              s.setbyte(i, raw.getbyte(i) + prev_scanline_byte(i)/2)
             end
             bpp1.upto(size-2) do |i|
-              s.setbyte(i,
-                imagedata.getbyte(@offset+i+1) + (s.getbyte(i-bpp1) + prev_scanline_byte(i))/2
-              )
+              s.setbyte(i, raw.getbyte(i) + (s.getbyte(i-bpp1) + prev_scanline_byte(i))/2)
             end
 
           when FILTER_PAETH   # 4
             s = "\x00" * (size-1)
             0.upto(bpp1-1) do |i|
-              s.setbyte(i, imagedata.getbyte(@offset+i+1) + prev_scanline_byte(i))
+              s.setbyte(i, raw.getbyte(i) + prev_scanline_byte(i))
             end
             bpp1.upto(size-2) do |i|
               s.setbyte(i,
-                imagedata.getbyte(@offset+i+1) +
+                raw.getbyte(i) +
                 paeth_predictor(s.getbyte(i-bpp1), prev_scanline_byte(i), prev_scanline_byte(i-bpp1))
               )
             end
@@ -300,6 +302,25 @@ module ZPNG
       @offset ? @image.imagedata[@offset, size] : ''
     end
 
+    def raw_data= data
+      if data.size == size
+        @image.imagedata[@offset, size] = data
+      else
+        raise Exception, "raw data size must be #{size}, got #{data.size}"
+      end
+    end
+
+    # set raw byte data at specified offset
+    # modifies @image, resets @decoded_bytes
+    def raw_set offset, value
+      @decoded_bytes = nil
+      value = value.ord if value.is_a?(String)
+      if offset == 0
+        @filter = value # XXX possible bugs with Singleton Modules
+      end
+      @image.imagedata.setbyte(@offset+offset, value)
+    end
+
     private
 
     def prev_scanline_byte x
@@ -371,7 +392,13 @@ module ZPNG
 
     def export
       # we export in FILTER_NONE mode
-      FILTER_NONE.chr + decoded_bytes
+      # [] is for preventing spare tail bytes that can break scanlines sequence
+      if @decoded_bytes
+        FILTER_NONE.chr + decoded_bytes[0,size-1]
+      else
+        # scanline was never decoded => export it as-is to save memory & CPU
+        @image.imagedata[@offset, size]
+      end
     end
 
     def each_pixel

data/spec/bad_samples_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'zpng/cli'
+
+each_sample("bad/*.png") do |fname|
+  describe fname do
+    before(:all) do
+      @img = ZPNG::Image.load(fname, :verbose => -2)
+    end
+
+    it "returns dimensions" do
+      lambda{
+        @img.width
+        @img.height
+      }.should_not raise_error
+    end
+
+    it "should access 1st pixel" do
+      @img[0,0].should be_instance_of(ZPNG::Color)
+    end
+
+    describe "CLI" do
+      it "shows info & chunks" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-qqq"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+        out.should include("#{@img.width}x#{@img.height}")
+      end
+
+      it "shows scanlines" do
+        orig_stdout, out = $stdout, ""
+        begin
+          $stdout = StringIO.new(out)
+          lambda { ZPNG::CLI.new([fname, "-qqq", "--scanlines"]).run }.should_not raise_error
+        ensure
+          $stdout = orig_stdout
+        end
+        sl = out.scan(/scanline/i)
+        sl.size.should > 0
+        sl.size.should == @img.scanlines.size
+      end
+    end
+  end
+end

data/spec/color_spec.rb

@@ -47,4 +47,29 @@ describe ZPNG::Color do
     [c3,c2,c1].sort.should == [c1,c2,c3]
     [c1,c3,c2].sort.should == [c1,c2,c3]
   end
+
+  describe "#from_html" do
+    it "should understand short notation" do
+      ZPNG::Color.from_html('#ff1133').should == ZPNG::Color.new(0xff,0x11,0x33)
+    end
+    it "should understand long notation" do
+      ZPNG::Color.from_html('#f13').should == ZPNG::Color.new(0xff,0x11,0x33)
+    end
+    it "should understand short notation w/o '#'" do
+      ZPNG::Color.from_html('ff1133').should == ZPNG::Color.new(0xff,0x11,0x33)
+    end
+    it "should understand long notation w/o '#'" do
+      ZPNG::Color.from_html('f13').should == ZPNG::Color.new(0xff,0x11,0x33)
+    end
+    it "should set alpha" do
+      ZPNG::Color.from_html('f13', :alpha => 0x11).should ==
+        ZPNG::Color.new(0xff,0x11,0x33, 0x11)
+
+      ZPNG::Color.from_html('#f13', :a => 0x44).should ==
+        ZPNG::Color.new(0xff,0x11,0x33, 0x44)
+
+      ZPNG::Color.from_html('f13').should_not ==
+        ZPNG::Color.new(0xff,0x11,0x33, 0x11)
+    end
+  end
 end

data/zpng.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zpng"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-13"
+  s.date = "2013-01-24"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zpng"]
   s.extra_rdoc_files = [
@@ -49,6 +49,8 @@ Gem::Specification.new do |s|
     "lib/zpng/text_chunk.rb",
     "misc/chars.png",
     "misc/gen_ascii_map.rb",
+    "samples/bad/000000.png",
+    "samples/bad/b1.png",
     "samples/captcha_4bpp.png",
     "samples/cats.png",
     "samples/itxt.png",
@@ -68,6 +70,7 @@ Gem::Specification.new do |s|
     "spec/adam7_spec.rb",
     "spec/alpha_spec.rb",
     "spec/ascii_spec.rb",
+    "spec/bad_samples_spec.rb",
     "spec/bmp_spec.rb",
     "spec/cli_spec.rb",
     "spec/color_spec.rb",

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: what_methods
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: 
 email: zed.0xff@gmail.com
 executables:
@@ -132,6 +132,8 @@ files:
 - lib/zpng/text_chunk.rb
 - misc/chars.png
 - misc/gen_ascii_map.rb
+- samples/bad/000000.png
+- samples/bad/b1.png
 - samples/captcha_4bpp.png
 - samples/cats.png
 - samples/itxt.png
@@ -151,6 +153,7 @@ files:
 - spec/adam7_spec.rb
 - spec/alpha_spec.rb
 - spec/ascii_spec.rb
+- spec/bad_samples_spec.rb
 - spec/bmp_spec.rb
 - spec/cli_spec.rb
 - spec/color_spec.rb
@@ -177,20 +180,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3712335013458038737
-  none: false
+      hash: 377147211466559287
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24