zpng 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b35d6d1f87f6a32f1de261d07be9a5670cad8892fdf8033a46c6189ac60c6c5
-  data.tar.gz: 584811c71db552f0b07f701f324b3e359d101c7650c975280f6c529cc8ecb246
+  metadata.gz: 45cbe6009082c09bd91263c35aafcde94fe9a244f30999a8181a42cde9d8c591
+  data.tar.gz: bfb0767ed14b07544ca7159454b9dbe5ccdd404f98f7e293dddb52b13abf43aa
 SHA512:
-  metadata.gz: e22d560929ca762532c078ac6ab7732788032ec58e86d20156c35169f0ebf44c498b69069adcb563b70ab8f770aa20116c5c5da4e9bd2847a716c504bc164c5f
-  data.tar.gz: b34d79aa9ca9b1c4bfa8770ca59c463eff6155687e27891f143b19fc142e07c914e1d7412f51446bacb6ba637b3879c9e662c06cb0003b51fff4d102b2ec5d8c
+  metadata.gz: f3929af614a96f549e331a65c15f210bc96bd52c5d88625d85156eb507773b89fc010d968ceddd25de213124db0dc935821dc02f255555eff4780ff20b87eb91
+  data.tar.gz: 1d5ab750a6f0aa24fe710ee53b53240d0b3a4335e3484c6c24eb99419413acc3701af9bd7aa5c3928b6971344e0759ee1843e5dbeed09004d06906ef5f9d0a4c

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'rainbow', '~> 3.1.1'
+gem "iostruct", ">= 0.7.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,13 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    builder (3.2.4)
+    activesupport (7.1.6)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
+    builder (3.3.0)
+    cgi (0.5.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
+    date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.5.0)
-    faraday (1.10.0)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -20,18 +43,20 @@ GEM
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    git (1.13.1)
+    git (2.3.3)
+      activesupport (>= 5.0)
       addressable (~> 2.8)
+      process_executer (~> 1.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -40,7 +65,12 @@ GEM
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     hashie (3.6.0)
-    highline (2.0.3)
+    highline (3.1.2)
+      reline
+    i18n (1.14.8)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    iostruct (0.7.0)
     juwelier (2.4.9)
       builder
       bundler
@@ -53,15 +83,19 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.4.1)
+    jwt (2.10.2)
+      base64
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.8.1)
-    multi_json (1.15.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.26.1)
+    multi_json (1.19.1)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nokogiri (1.17.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -69,45 +103,56 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    psych (4.0.4)
+    process_executer (1.1.2)
+    psych (5.3.1)
+      date
       stringio
-    public_suffix (4.0.7)
-    racc (1.6.2)
-    rack (3.0.4.1)
+    public_suffix (6.0.2)
+    racc (1.8.1)
+    rack (3.2.4)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rchardet (1.8.0)
-    rdoc (6.4.0)
+    rake (13.3.1)
+    rchardet (1.10.0)
+    rdoc (7.1.0)
+      erb
       psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-its (1.3.0)
+    rspec-its (1.3.1)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     ruby2_keywords (0.0.5)
+    securerandom (0.3.2)
     semver2 (3.4.2)
-    stringio (3.0.2)
+    stringio (3.2.0)
     thread_safe (0.3.6)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  iostruct (>= 0.7.0)
   juwelier (~> 2.4.9)
   rainbow (~> 3.1.1)
   rspec (~> 3.11.0)
   rspec-its (~> 1.3.0)
 
 BUNDLED WITH
-   2.3.12
+   2.4.22

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.6

data/lib/zpng/bmp/reader.rb

@@ -1,22 +1,27 @@
+# -*- coding:binary; frozen_string_literal: true -*-
+require 'iostruct'
+
 module ZPNG
   module BMP
 
-    class BITMAPFILEHEADER < ReadableStruct.new 'VvvV', #a2VvvV',
-      #:bfType,
-      :bfSize,      # the size of the BMP file in bytes
+    MAGIC = "BM"
+
+    class BITMAPFILEHEADER < IOStruct.new 'VvvV',
+      #:bfType,         # read separately as magic bytes
+      :bfSize,          # the size of the BMP file in bytes
       :bfReserved1,
       :bfReserved2,
-      :bfOffBits    # imagedata offset
+      :bfOffBits        # imagedata offset
 
       def inspect
         "<" + super.partition(self.class.to_s.split('::').last)[1..-1].join
       end
     end
 
-    class BITMAPINFOHEADER < ReadableStruct.new 'V3v2V6',
+    class BITMAPINFOHEADER < IOStruct.new 'Vl2v2V2l2V2',  # l2 for signed width/height and pels/meter
       :biSize,          # BITMAPINFOHEADER::SIZE
-      :biWidth,
-      :biHeight,
+      :biWidth,         # can be negative for top-down DIB
+      :biHeight,        # can be negative for top-down DIB
       :biPlanes,
       :biBitCount,
       :biCompression,

data/lib/zpng/cli.rb

@@ -177,11 +177,11 @@ module ZPNG
 
     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)
+        @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"
+      puts "[.] uncompressed imagedata size = #{@img.imagedata_size} bytes" if @img.imagedata_size.to_i > 0
       _conditional_hexdump(@img.imagedata, 3) if @options[:verbose] > 0
     end
 

data/lib/zpng/color.rb

@@ -6,6 +6,8 @@ module ZPNG
 
     include DeepCopyable
 
+    MAX_VALUES = 17.times.map{ |x| (2**x)-1 }.freeze
+
     def initialize *a
       h = a.last.is_a?(Hash) ? a.pop : {}
       @r,@g,@b,@a = *a
@@ -14,11 +16,15 @@ module ZPNG
       @depth       = h[:depth]       || 8
 
       # default ALPHA = 0xff - opaque
-      @a ||= h[:alpha] || h[:a] || (2**@depth-1)
+      @a ||= h[:alpha] || h[:a] || max_value
+    end
+
+    def max_value
+      MAX_VALUES[@depth]
     end
 
     def a= a
-      @a = a || (2**@depth-1)   # NULL alpha means fully opaque
+      @a = a || max_value   # NULL alpha means fully opaque
     end
     alias :alpha  :a
     alias :alpha= :a=
@@ -64,8 +70,7 @@ module ZPNG
     end
 
     def white?
-      max = 2**depth-1
-      r == max && g == max && b == max
+      r == max_value && g == max_value && b == max_value
     end
 
     def black?
@@ -77,7 +82,7 @@ module ZPNG
     end
 
     def opaque?
-      a.nil? || a == 2**depth-1
+      a.nil? || a == max_value
     end
 
     def to_grayscale
@@ -135,7 +140,7 @@ module ZPNG
     # try to convert to one pseudographics ASCII character
     def to_ascii map=ASCII_MAP
       #p self
-      map[self.to_grayscale*(map.size-1)/(2**@depth-1), 1]
+      map[self.to_grayscale*(map.size-1)/max_value, 1]
     end
 
     # convert to ANSI color name
@@ -162,7 +167,7 @@ module ZPNG
       color = Color.new :depth => new_depth
       if new_depth > self.depth
         %w'r g b a'.each do |part|
-          color.send("#{part}=", (2**new_depth-1)/(2**depth-1)*self.send(part))
+          color.send("#{part}=", (2**new_depth-1)/max_value*self.send(part))
         end
       else
         # new_depth < self.depth
@@ -242,27 +247,96 @@ module ZPNG
     end
 
     # Op! op! op! Op!! Oppan Gangnam Style!!
-    def op op, c=nil
-      # XXX what to do with alpha?
-      max = 2**depth-1
+    def op op, c=nil, op2=:&
+      # alpha is kept from 1st color
       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
+          @r.send(op, c.r).send(op2, max_value),
+          @g.send(op, c.g).send(op2, max_value),
+          @b.send(op, c.b).send(op2, max_value),
+#          [0, [@r.send(op, c.r), max_value].min].max,
+#          [0, [@g.send(op, c.g), max_value].min].max,
+#          [0, [@b.send(op, c.b), max_value].min].max,
+          depth: depth,
+          alpha: alpha
         )
       else
         Color.new(
-          @r.send(op) & max,
-          @g.send(op) & max,
-          @b.send(op) & max,
-          :depth => self.depth
+          @r.send(op).send(op2, max_value),
+          @g.send(op).send(op2, max_value),
+          @b.send(op).send(op2, max_value),
+#          [0, [@r.send(op), max_value].min].max,
+#          [0, [@g.send(op), max_value].min].max,
+#          [0, [@b.send(op), max_value].min].max,
+          depth: depth,
+          alpha: alpha
         )
       end
     end
 
+    # multiplies the pixel values of the upper layer with those of the layer below it and then divides the result by MAX_VALUE
+    def * c
+      c = c.to_depth(depth)
+      Color.new(
+        (@r * c.r) / max_value,
+        (@g * c.g) / max_value,
+        (@b * c.b) / max_value,
+        depth: depth,
+        alpha: alpha
+      )
+    end
+
+    def / c
+      c = c.to_depth(depth)
+      Color.new(
+        [max_value, (max_value*@r/c.r)].min,
+        [max_value, (max_value*@g/c.g)].min,
+        [max_value, (max_value*@b/c.b)].min,
+#        (max_value*@r/c.r),
+#        (max_value*@g/c.g),
+#        (max_value*@b/c.b),
+        depth: depth,
+        alpha: alpha
+      )
+    rescue ZeroDivisionError
+      c = c.dup
+      c.r = 1 if c.r == 0 # XXX or it should be max_value ?
+      c.g = 1 if c.g == 0
+      c.b = 1 if c.b == 0
+      return Color.new(
+        [max_value, (max_value*@r/c.r)].min,
+        [max_value, (max_value*@g/c.g)].min,
+        [max_value, (max_value*@b/c.b)].min,
+        depth: depth,
+        alpha: alpha
+      )
+    end
+
+    def divmul c1, c2
+      c1 = c1.to_depth(depth)
+      c2 = c2.to_depth(depth)
+      Color.new(
+        [max_value, (c2.r*@r/c1.r)].min,
+        [max_value, (c2.g*@g/c1.g)].min,
+        [max_value, (c2.b*@b/c1.b)].min,
+        depth: depth,
+        alpha: alpha
+      )
+    end
+
+    # http://www.pegtop.net/delphi/articles/blendmodes/screen.htm
+    def screen c
+      c = c.to_depth(depth)
+      Color.new(
+        max_value - (((max_value-@r) * (max_value-c.r)) >> depth),
+        max_value - (((max_value-@g) * (max_value-c.g)) >> depth),
+        max_value - (((max_value-@b) * (max_value-c.b)) >> depth),
+        depth: depth,
+        alpha: alpha
+      )
+    end
+
     # for Array.uniq()
     def hash
       self.to_i

data/lib/zpng/image.rb

@@ -1,8 +1,9 @@
+# -*- coding:binary; frozen_string_literal: true -*-
 require 'stringio'
 
 module ZPNG
   class Image
-    attr_accessor :chunks, :scanlines, :imagedata, :extradata, :format, :verbose
+    attr_accessor :chunks, :scanlines, :extradata, :format, :verbose
 
     # now only for (limited) BMP support
     attr_accessor :color_class
@@ -12,15 +13,21 @@ module ZPNG
     alias :dup   :deep_copy
 
     include BMP::Reader
+    include JPEG::Reader
 
-    PNG_HDR = "\x89PNG\x0d\x0a\x1a\x0a".force_encoding('binary')
-    BMP_HDR = "BM".force_encoding('binary')
+    PNG_HDR = "\x89PNG\x0d\x0a\x1a\x0a"
 
     # possible input params:
     #   IO      of opened image file
     #   String  with image file already readed
     #   Hash    of image parameters to create new blank image
+    #   width, height
     def initialize x, h={}
+      if x.is_a?(Numeric) && h.is_a?(Numeric)
+        x = { width: x, height: h }
+        h = {}
+      end
+
       @chunks = []
       @extradata = []
       @color_class = Color
@@ -74,6 +81,18 @@ module ZPNG
       end
       alias :load_file :load
       alias :from_file :load # as in ChunkyPNG
+
+      def from_rgb data, width:, height:
+        img = new(width: width, height: height, bpp: 24)
+        img.scanlines = height.times.map{ |i| ScanLine.new(img, i, decoded_bytes: data[width*3*i, width*3]) }
+        img
+      end
+
+      def from_rgba data, width:, height:
+        img = new(width: width, height: height, bpp: 32)
+        img.scanlines = height.times.map{ |i| ScanLine.new(img, i, decoded_bytes: data[width*4*i, width*4]) }
+        img
+      end
     end
 
     # save image to file
@@ -154,11 +173,13 @@ module ZPNG
       # 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
+      hdr = io.read(BMP::MAGIC.size)
+      if hdr == BMP::MAGIC
         _read_bmp io
+      elsif hdr == JPEG::MAGIC
+        _read_jpeg io
       else
-        hdr << io.read(PNG_HDR.size - BMP_HDR.size)
+        hdr << io.read(PNG_HDR.size - BMP::MAGIC.size)
         if hdr == PNG_HDR
           _read_png io
         else
@@ -276,7 +297,7 @@ module ZPNG
     # on errors keep going and try to return maximum possible data
     def _safe_inflate data
       zi = Zlib::Inflate.new
-      pos = 0; r = ''
+      pos = 0; r = String.new
       begin
         # save some memory by not using String#[] when not necessary
         r << zi.inflate(pos==0 ? data : data[pos..-1])
@@ -326,6 +347,11 @@ module ZPNG
         end
     end
 
+    def imagedata= data
+      @scanlines = nil
+      @imagedata = data
+    end
+
     def imagedata_size
       if new_image?
         @scanlines.map(&:size).inject(&:+)
@@ -409,6 +435,18 @@ module ZPNG
       end
     end
 
+    def to_ansi wide: false
+      spc = wide ? "  " : " "
+      r = String.new
+      height.times do |y|
+        width.times do |x|
+          r << spc.background(self[x,y].to_ansi)
+        end
+        r << "\n"
+      end
+      r
+    end
+
     def extract_block x,y=nil,w=nil,h=nil
       if x.is_a?(Hash)
         Block.new(self,x[:x], x[:y], x[:width], x[:height])
@@ -487,11 +525,10 @@ module ZPNG
     end
 
     # returns new image
-    def crop params
-      decode_all_scanlines
-      # deep copy first, then crop!
-      deep_copy.crop!(params)
+    def cropped **args
+      dup.crop!(**args)
     end
+    alias crop cropped
 
     def pixels
       Pixels.new(self)
@@ -508,11 +545,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
@@ -544,5 +584,133 @@ module ZPNG
 
       new_img
     end
+
+    def _normalize_rotate x
+      x = x.to_i
+      x %= 360
+      x += 360 if x < 0
+      raise "invalid rotate: #{x}" if x%90 != 0
+      x
+    end
+
+    # always returns a copy
+    def rotated degrees
+      degrees = _normalize_rotate(degrees)
+      return dup if degrees == 0
+
+      dst = self
+      while degrees > 0
+        dst = dst.rotated_90_cw
+        degrees -= 90
+      end
+      dst
+    end
+
+    # returns new image rotated 90 degrees clockwise
+    def rotated_90_cw
+      dst = Image.new(width: height, height: width, bpp: bpp)
+      each_pixel do |c,x,y|
+        dst[height-y-1,x] = c
+      end
+      dst
+    end
+
+    def copy_from(src, copy_transparent: false,
+                  src_x: 0, src_y: 0, src_width: src.width, src_height: src.height,
+                  dst_x: 0, dst_y: 0, dst_width: src_width, dst_height: src_height)
+
+      dst_height.times do |iy|
+        dy = dst_y + iy
+        next if dy >= height
+        sy = src_y + iy * src_height / dst_height
+        next if sy >= src.height
+        dst_width.times do |ix|
+          dx = dst_x + ix
+          next if dx >= width
+          sx = src_x + ix * src_width / dst_width
+          next if sx >= src.width
+          c = src[sx,sy]
+          next if c.transparent? && !copy_transparent
+          self[dx,dy] = c
+        end
+      end
+      self
+    end
+
+    # op is a symbol of operation, like :+, :-, :* ...
+    def op_from(src, op,
+                  src_x: 0, src_y: 0, src_width: src.width, src_height: src.height,
+                  dst_x: 0, dst_y: 0, dst_width: src_width, dst_height: src_height)
+
+      dst_height.times do |iy|
+        dy = dst_y + iy
+        next if dy >= height
+        sy = src_y + iy * src_height / dst_height
+        next if sy >= src.height
+        dst_width.times do |ix|
+          dx = dst_x + ix
+          next if dx >= width
+          sx = src_x + ix * src_width / dst_width
+          next if sx >= src.width
+          c = src[sx,sy]
+          self[dx,dy] = self[dx,dy].send(op, c)
+        end
+      end
+      self
+    end
+
+    def scale(x, y=x)
+      dst = Image.new(width: width*x, height: height*y, bpp: bpp)
+      dst.copy_from(self, dst_width: dst.width, dst_height: dst.height)
+    end
+
+    alias scaled scale
+
+    def shear(mx, my)
+      src = self
+      dst = Image.new(width: width+(mx*height).abs, height: height+(my*width).abs, bpp: bpp)
+      xadd = mx < 0 ? src.height: 0
+      yadd = my < 0 ? src.width : 0
+      each_pixel do |c,x,y|
+        dst[xadd + (x+mx*y).to_i, yadd + (y+my*x).to_i] = c
+      end
+      dst
+    end
+
+    def empty?
+      pixels.all?(&:transparent?)
+    end
+
+    def * value; op(:*, value); end
+    def / value; op(:/, value); end
+    def + value; op(:+, value); end
+    def - value; op(:-, value); end
+
+    def op op, value
+      case value
+      when Image
+        dst = Image.new(width: width, height: height, bpp: bpp)
+        each_pixel do |c,x,y|
+          dst[x,y] = c.send(op, value[x,y])
+        end
+        dst
+      when Color
+        dst = Image.new(width: width, height: height, bpp: bpp)
+        each_pixel do |c,x,y|
+          dst[x,y] = c.send(op, value)
+        end
+        dst
+      else
+        raise ArgumentError, "cannot #{op} Image by #{value}"
+      end
+    end
+
+    def divmul c1, c2
+      dst = Image.new(width: width, height: height, bpp: bpp)
+      each_pixel do |c,x,y|
+        dst[x,y] = c.divmul(c1, c2)
+      end
+      dst
+    end
   end
 end