zpng 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b35d6d1f87f6a32f1de261d07be9a5670cad8892fdf8033a46c6189ac60c6c5
-  data.tar.gz: 584811c71db552f0b07f701f324b3e359d101c7650c975280f6c529cc8ecb246
+  metadata.gz: 99e5f2ae6f86a27757f442011a5fa365b06f4a4bf52c1348a6018bb0cc8b5f85
+  data.tar.gz: f435672e701c25224d5e61dba082131608567fbe14d86fbd4065495d460d2932
 SHA512:
-  metadata.gz: e22d560929ca762532c078ac6ab7732788032ec58e86d20156c35169f0ebf44c498b69069adcb563b70ab8f770aa20116c5c5da4e9bd2847a716c504bc164c5f
-  data.tar.gz: b34d79aa9ca9b1c4bfa8770ca59c463eff6155687e27891f143b19fc142e07c914e1d7412f51446bacb6ba637b3879c9e662c06cb0003b51fff4d102b2ec5d8c
+  metadata.gz: ce27f95e40b522d1dd854ecb4619650e22a6fc2b5bd4c9aee6c3247e5d32bf98da6778343645723359bb05872e33a68cad9ad08dbc2fae7c0f09c123d6567675
+  data.tar.gz: 3f9ea93a539c4ef1f16900eab6b9e4a8e8f2be7aceed695778cf296dd151df642e1da8b4bff3ff23f34aa560c660816d99d46d462d431547f32455fcfa7375e8

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/zpng/image.rb

@@ -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/bad_samples_spec.rb

@@ -19,6 +19,18 @@ each_sample("bad/*.png") do |fname|
       @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, ""

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/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.4 ruby lib
+# stub: zpng 0.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zpng".freeze
-  s.version = "0.4.4"
+  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 = "2023-02-14"
+  s.date = "2023-02-19"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zpng".freeze]
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zpng
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow