zpng 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cceb23c5330f39f49baad1cb807e023e79e27cfdf6c9bb9afca1def11d43556
-  data.tar.gz: 3985fed46171d58778e3d6ad8fe06e8c2e1e94dde884554dfde9495fe737d6da
+  metadata.gz: 99e5f2ae6f86a27757f442011a5fa365b06f4a4bf52c1348a6018bb0cc8b5f85
+  data.tar.gz: f435672e701c25224d5e61dba082131608567fbe14d86fbd4065495d460d2932
 SHA512:
-  metadata.gz: 7e35dbd0d0f09a8aad7c8a0fce43f9a46ca9fa1c8a64d1ca1b20452e1273018bc01deb1dba00e4ec07ff0b8d27b80510b27078eeaf017a78224a1fce620cd12b
-  data.tar.gz: 965d3ace9f810ccb433b6574c27b409168103d81f5f86cadab8450d012f4c81ce3fa44c19309d99d01ddde36fa14ff4b18bd345e59ab60616f3aa010c100bbe1
+  metadata.gz: ce27f95e40b522d1dd854ecb4619650e22a6fc2b5bd4c9aee6c3247e5d32bf98da6778343645723359bb05872e33a68cad9ad08dbc2fae7c0f09c123d6567675
+  data.tar.gz: 3f9ea93a539c4ef1f16900eab6b9e4a8e8f2be7aceed695778cf296dd151df642e1da8b4bff3ff23f34aa560c660816d99d46d462d431547f32455fcfa7375e8

data/Gemfile.lock

@@ -30,7 +30,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    git (1.11.0)
+    git (1.13.1)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -55,24 +56,24 @@ GEM
     jwt (2.4.1)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
-    nokogiri (1.13.6)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.9)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     psych (4.0.4)
       stringio
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    racc (1.6.2)
+    rack (3.0.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)

data/Rakefile

@@ -23,6 +23,7 @@ Juwelier::Tasks.new do |gem|
   gem.authors = ["Andrey \"Zed\" Zaikin"]
   gem.executables = %w'zpng'
   gem.files.include "lib/**/*.rb"
+  gem.files.exclude "samples/**/*"
   # dependencies defined in Gemfile
 end
 Juwelier::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.5

data/lib/zpng/adam7_decoder.rb

@@ -1,19 +1,20 @@
 module ZPNG
   class Adam7Decoder
-    attr_accessor :image
+    attr_accessor :bpp
     attr_reader :scanlines_count
 
     # http://en.wikipedia.org/wiki/Adam7_algorithm#Passes
-    def initialize img
-      @image = img
+    def initialize width, height, bpp
+      @bpp = bpp
+      raise "Invalid BPP #{@bpp.inspect}" if @bpp.to_i == 0
       @widths = [
-        [(img.width/8.0).ceil]     * (img.height/8.0).ceil,     # pass1
-        [((img.width-4)/8.0).ceil] * (img.height/8.0).ceil,     # pass2
-        [(img.width/4.0).ceil]     * ((img.height-4)/8.0).ceil, # pass3
-        [((img.width-2)/4.0).ceil] * (img.height/4.0).ceil,     # pass4
-        [(img.width/2.0).ceil]     * ((img.height-2)/4.0).ceil, # pass5
-        [((img.width-1)/2.0).ceil] * (img.height/2.0).ceil,     # pass6
-        [img.width]                * ((img.height-1)/2.0).ceil  # pass7
+        [(width/8.0).ceil]     * (height/8.0).ceil,     # pass1
+        [((width-4)/8.0).ceil] * (height/8.0).ceil,     # pass2
+        [(width/4.0).ceil]     * ((height-4)/8.0).ceil, # pass3
+        [((width-2)/4.0).ceil] * (height/4.0).ceil,     # pass4
+        [(width/2.0).ceil]     * ((height-2)/4.0).ceil, # pass5
+        [((width-1)/2.0).ceil] * (height/2.0).ceil,     # pass6
+        [width]                * ((height-1)/2.0).ceil  # pass7
       ].map{ |x| x == [0] ? [] : x }
       @scanlines_count = 0
       # two leading zeroes added specially for convert_coords() code readability
@@ -28,7 +29,7 @@ module ZPNG
 
     # scanline size in bytes, INCLUDING leading filter byte
     def scanline_size idx
-      (scanline_width(idx) * image.bpp / 8.0).ceil + 1
+      (scanline_width(idx) * bpp / 8.0).ceil + 1
     end
 
     # scanline offset in imagedata

data/lib/zpng/chunk.rb

@@ -51,10 +51,10 @@ module ZPNG
       end
     end
 
-    def export
+    def export( fix_crc: true )
       @data = self.export_data # virtual
       @size = @data.size # XXX hmm.. is it always is?
-      fix_crc!
+      fix_crc! if fix_crc
       [@size,@type].pack('Na4') + @data + [@crc].pack('N')
     end
 
@@ -98,6 +98,9 @@ module ZPNG
     class IHDR < Chunk
       attr_accessor :width, :height, :depth, :color, :compression, :filter, :interlace
 
+      SIZE = 13
+      FORMAT = 'NNC5'
+
       PALETTE_USED = 1
       COLOR_USED   = 2
       ALPHA_USED   = 4
@@ -130,8 +133,6 @@ module ZPNG
         COLOR_RGBA       => [          8, 16 ],
       }
 
-      FORMAT = 'NNC5'
-
       def initialize x
         super
         vars = %w'width height depth color compression filter interlace' # order is important
@@ -173,7 +174,7 @@ module ZPNG
           @filter      ||= 0
           @interlace   ||= 0
 
-          unless ALLOWED_DEPTHS[@color].include?(@depth)
+          unless ALLOWED_DEPTHS[@color]&.include?(@depth)
             raise "[!] invalid color mode (#{@color.inspect}) / bit depth (#{@depth.inspect}) combination"
           end
         end
@@ -190,7 +191,8 @@ module ZPNG
 
       # bits per pixel
       def bpp
-        SAMPLES_PER_COLOR[@color] * depth
+        spc = SAMPLES_PER_COLOR[@color]
+        spc ? spc * depth : nil
       end
 
       def color_used?
@@ -275,8 +277,32 @@ module ZPNG
       alias :<< :find_or_add
     end
 
+    class CHRM < Chunk
+      SIZE = 32
+    end
+
+    class GAMA < Chunk
+      SIZE = 4
+    end
+
     class IDAT < Chunk; end
-    class IEND < Chunk; end
+
+    class TIME < Chunk
+      SIZE = 7
+    end
+
+    class IEND < Chunk
+      SIZE = 4
+    end
+
+    class PHYS < Chunk
+      SIZE = 9
+    end
+
+    class SRGB < Chunk
+      SIZE = 1
+    end
+
     class TRNS < Chunk; end
 
   end

data/lib/zpng/cli.rb

@@ -179,13 +179,15 @@ module ZPNG
       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 "[.] 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"
+      puts "[.] uncompressed imagedata size = #{@img.imagedata_size || '?'} bytes"
       _conditional_hexdump(@img.imagedata, 3) if @options[:verbose] > 0
     end
 
     def _conditional_hexdump data, v2 = 2
+      return unless data
+
       if @options[:verbose] <= 0
         # do nothing
       elsif @options[:verbose] < v2
@@ -221,7 +223,11 @@ module ZPNG
           end
         puts "[.] #{chunk.inspect(@options[:verbose]).sub(chunk.type, colored_type)} #{colored_crc}"
 
-        _conditional_hexdump(chunk.data) unless chunk.size == 0
+        if @options[:verbose] >= 3
+          _conditional_hexdump(chunk.export(fix_crc: false))
+        else
+          _conditional_hexdump(chunk.data)
+        end
       end
     end
 

data/lib/zpng/image.rb

@@ -62,7 +62,7 @@ module ZPNG
     end
 
     def adam7
-      @adam7 ||= Adam7Decoder.new(self)
+      @adam7 ||= Adam7Decoder.new(width, height, bpp)
     end
 
     class << self
@@ -119,7 +119,7 @@ module ZPNG
         io.seek(chunk.offset+delta, IO::SEEK_SET)
         potential_chunk = Chunk.new(io)
         if potential_chunk.valid?
-          STDERR.puts "[!] heuristics: found invalid chunk at offset #{chunk.offset}, but valid one at #{chunk.offset+delta}. using latter".red
+          STDERR.puts "[!] heuristics: found invalid #{chunk.type.inspect} chunk at offset #{chunk.offset}, but valid #{potential_chunk.type.inspect} at #{chunk.offset+delta}. using latter".red
           if delta > 0
             io.seek(chunk.offset, IO::SEEK_SET)
             data = io.read(delta)
@@ -330,7 +330,7 @@ module ZPNG
       if new_image?
         @scanlines.map(&:size).inject(&:+)
       else
-        imagedata.size
+        imagedata&.size
       end
     end
 
@@ -508,11 +508,14 @@ module ZPNG
     end
 
     def each_pixel &block
-      height.times do |y|
-        width.times do |x|
-          yield(self[x,y], x, y)
+      e = Enumerator.new do |ee|
+        height.times do |y|
+          width.times do |x|
+            ee.yield(self[x,y], x, y)
+          end
         end
       end
+      block_given? ? e.each(&block) : e
     end
 
     # returns new deinterlaced image if deinterlaced

data/lib/zpng/scan_line.rb

@@ -1,4 +1,7 @@
 #coding: binary
+
+require 'set'
+
 module ZPNG
   class ScanLine
     FILTER_NONE           = 0
@@ -39,6 +42,7 @@ module ZPNG
           STDERR.puts "[!] #{self.class}: ##@idx: no data at pos 0, scanline dropped".red
         end
       end
+      @errors = Set.new
     end
 
     # ScanLine is BAD if it has no filter
@@ -146,6 +150,24 @@ module ZPNG
       end # case image.hdr.color
     end
 
+    def get_raw x
+      return nil if @bpp > 8 || image.hdr.color != COLOR_INDEXED
+
+      raw =
+        if @BPP
+          # 8, 16, 24, 32, 48 bits per pixel
+          decoded_bytes[x*@BPP, @BPP]
+        else
+          # 1, 2 or 4 bits per pixel
+          decoded_bytes[x*@bpp/8]
+        end
+
+      mask  = 2**@bpp-1
+      shift = 8-(x%(8/@bpp)+1)*@bpp
+      raise "invalid shift #{shift}" if shift < 0 || shift > 7
+      idx = (raw.ord >> shift) & mask
+    end
+
     def [] x
       raw =
         if @BPP
@@ -162,6 +184,20 @@ module ZPNG
         shift = 8-(x%(8/@bpp)+1)*@bpp
         raise "invalid shift #{shift}" if shift < 0 || shift > 7
         idx = (raw.ord >> shift) & mask
+        color = image.palette[idx]
+        unless color
+          if !@errors.include?(x) && @image.verbose >= -1
+            # prevent same error popping up multiple times, f.ex. in zsteg analysis
+            @errors << x
+            if (32..127).include?(idx)
+              msg = '[!] %s: color #%-3d ("%c") at x=%d y=%d is out of palette!'.red % [self.class, idx, idx, x, @idx]
+            else
+              msg = "[!] %s: color #%-3d at x=%d y=%d is out of palette!".red % [self.class, idx, x, @idx]
+            end
+            STDERR.puts msg
+          end
+          color = Color.new(0,0,0)
+        end
         if image.trns
           # transparency from tRNS chunk
           # For color type 3 (indexed color), the tRNS chunk contains a series of one-byte alpha values,
@@ -171,17 +207,14 @@ module ZPNG
           #   Alpha for palette index 1:  1 byte
           #   ...
           #
-          color = image.palette[idx].dup
           if color.alpha = image.trns.data[idx]
             # if it's not NULL - convert it from char to int,
             # otherwise it means fully opaque color, as well as NULL alpha in ZPNG::Color
+            color = color.dup
             color.alpha = color.alpha.ord
           end
-          return color
-        else
-          # no transparency
-          return image.palette[idx]
         end
+        return color
 
       when COLOR_GRAYSCALE              # ALLOWED_DEPTHS: 1, 2, 4, 8, 16
         c = if @bpp == 16

data/spec/adam7_spec.rb

@@ -13,9 +13,7 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, slw|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = Object.new
-        allow(img).to receive_messages(:width => w, :height => h)
-        adam7 = ZPNG::Adam7Decoder.new(img)
+        adam7 = ZPNG::Adam7Decoder.new(w, h, 8)
         slw.size.times.map{ |i| adam7.scanline_width(i) }.should == slw
       end
     end
@@ -34,9 +32,7 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, n|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = Object.new
-        allow(img).to receive_messages(:width => w, :height => h)
-        adam7 = ZPNG::Adam7Decoder.new(img)
+        adam7 = ZPNG::Adam7Decoder.new(w, h, 8)
         adam7.scanlines_count.should == n
       end
     end
@@ -54,9 +50,7 @@ describe ZPNG::Adam7Decoder do
     }.each do |dims, pst|
       it "should be right for #{dims} image" do
         w,h = dims.split('x').map(&:to_i)
-        img = Object.new
-        allow(img).to receive_messages(:width => w, :height => h)
-        adam7 = ZPNG::Adam7Decoder.new(img)
+        adam7 = ZPNG::Adam7Decoder.new(w, h, 8)
         adam7.instance_variable_get("@pass_starts").should == pst
       end
     end

data/spec/bad_samples_spec.rb

@@ -15,9 +15,22 @@ each_sample("bad/*.png") do |fname|
     end
 
     it "should access 1st pixel" do
+      skip "no BPP" unless @img.bpp
       @img[0,0].should be_instance_of(ZPNG::Color)
     end
 
+    it "accessess all pixels" do
+      skip "no BPP" unless @img.bpp
+      skip if fname == 'samples/bad/b1.png'
+      skip if fname == 'samples/bad/000000.png'
+      n = 0
+      @img.each_pixel do |px|
+        px.should be_instance_of(ZPNG::Color)
+        n += 1
+      end
+      n.should == @img.width*@img.height
+    end
+
     describe "CLI" do
       it "shows info & chunks" do
         orig_stdout, out = $stdout, ""
@@ -31,6 +44,7 @@ each_sample("bad/*.png") do |fname|
       end
 
       it "shows scanlines" do
+        skip "no BPP" unless @img.bpp
         orig_stdout, out = $stdout, ""
         begin
           $stdout = StringIO.new(out)

data/spec/pixel_access_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '/spec_helper'))
 require 'zpng/cli'
+require 'set'
 
 PNGSuite.each_good do |fname|
   describe fname.sub(%r|\A#{Regexp::escape(Dir.getwd)}/?|, '') do
@@ -12,5 +13,38 @@ PNGSuite.each_good do |fname|
       end
       n.should == img.width*img.height
     end
+
+    it "accessess all pixels with coords" do
+      img = ZPNG::Image.load(fname)
+      n = 0
+      ax = Set.new
+      ay = Set.new
+      img.each_pixel do |px, x, y|
+        px.should be_instance_of(ZPNG::Color)
+        n += 1
+        ax << x
+        ay << y
+      end
+      n.should == img.width*img.height
+      ax.size.should == img.width
+      ay.size.should == img.height
+    end
+
+    it "accessess all pixels using method #2" do
+      img = ZPNG::Image.load(fname)
+      n = 0
+      a = img.each_pixel.to_a
+      ax = Set.new
+      ay = Set.new
+      a.each do |px, x, y|
+        px.should be_instance_of(ZPNG::Color)
+        n += 1
+        ax << x
+        ay << y
+      end
+      n.should == img.width*img.height
+      ax.size.should == img.width
+      ay.size.should == img.height
+    end
   end
 end

data/spec/support/png_suite.rb

@@ -1,5 +1,5 @@
 module PNGSuite
-  PNG_SUITE_URL = "http://www.schaik.com/pngsuite/PngSuite-2011apr25.tgz"
+  PNG_SUITE_URL = "http://www.schaik.com/pngsuite/PngSuite-2017jul19.tgz"
 
   class << self
     attr_accessor :dir

data/zpng.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: zpng 0.4.3 ruby lib
+# stub: zpng 0.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zpng".freeze
-  s.version = "0.4.3"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andrey \"Zed\" Zaikin".freeze]
-  s.date = "2022-06-30"
+  s.date = "2023-02-19"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zpng".freeze]
   s.extra_rdoc_files = [
@@ -51,25 +51,6 @@ Gem::Specification.new do |s|
     "lib/zpng/text_chunk.rb",
     "misc/chars.png",
     "misc/gen_ascii_map.rb",
-    "samples/bad/000000.png",
-    "samples/bad/149511457-47db5096-662d-4221-84f9-1c2a0e20e323.png",
-    "samples/bad/b1.png",
-    "samples/captcha_4bpp.png",
-    "samples/cats.png",
-    "samples/itxt.png",
-    "samples/modify.rb",
-    "samples/mouse.bmp",
-    "samples/mouse.png",
-    "samples/mouse17.bmp",
-    "samples/mouse17.png",
-    "samples/qr_aux_chunks.png",
-    "samples/qr_bw.png",
-    "samples/qr_gray_alpha.png",
-    "samples/qr_grayscale.png",
-    "samples/qr_plte.png",
-    "samples/qr_plte_bw.png",
-    "samples/qr_rgb.png",
-    "samples/qr_rgba.png",
     "spec/adam7_spec.rb",
     "spec/alpha_spec.rb",
     "spec/ascii_spec.rb",
@@ -95,7 +76,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/zed-0xff/zpng".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.6".freeze
+  s.rubygems_version = "3.3.7".freeze
   s.summary = "pure ruby PNG file manipulation & validation".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -107,25 +107,6 @@ files:
 - lib/zpng/text_chunk.rb
 - misc/chars.png
 - misc/gen_ascii_map.rb
-- samples/bad/000000.png
-- samples/bad/149511457-47db5096-662d-4221-84f9-1c2a0e20e323.png
-- samples/bad/b1.png
-- samples/captcha_4bpp.png
-- samples/cats.png
-- samples/itxt.png
-- samples/modify.rb
-- samples/mouse.bmp
-- samples/mouse.png
-- samples/mouse17.bmp
-- samples/mouse17.png
-- samples/qr_aux_chunks.png
-- samples/qr_bw.png
-- samples/qr_gray_alpha.png
-- samples/qr_grayscale.png
-- samples/qr_plte.png
-- samples/qr_plte_bw.png
-- samples/qr_rgb.png
-- samples/qr_rgba.png
 - spec/adam7_spec.rb
 - spec/alpha_spec.rb
 - spec/ascii_spec.rb
@@ -167,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: pure ruby PNG file manipulation & validation

data/samples/modify.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-require 'zpng'
-include ZPNG
-
-img = Image.new(File.join(File.dirname(__FILE__),"http.png"))
-
-puts "[.] original:"
-puts img.to_s
-puts
-
-img.width.times do |x|
-  img[x,0] = (x % 2 == 0) ? Color::WHITE : Color::BLACK
-end
-
-puts "[.] modified:"
-puts img.to_s
-
-File.open("http-modified.png","wb") do |f|
-  f << img.export
-end