png 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ed4cb5ea785c269b2b1528b2630d99b24a3bc99a06c4a50961dc3c681959a169
+  data.tar.gz: f0a06a6423b7159878cbf5ed844e3600e32fec055e9fa46ace12e7d2329a474d
+SHA512:
+  metadata.gz: f281dfb508c5c4ccc5bd82b69e69266b8931e198fa0a8deef3b47d3d13e22ca75b66b9df0d4d37ab44b9581fe3db8b9ef74a00f75a274afa6c1da9a0e8e49f0e
+  data.tar.gz: 6b9c5ad8ba80a4c8ed527b56c271de1529b541c9b0f4dac533dc1568a2cf9263f3800ff51336de65e6d3aa94f2c7f7747dacbfd852108495716e69858efa95e9

data/History.txt

@@ -1,3 +1,29 @@
+=== 1.3.0 / 2024-08-27
+
+Daaaamn... another 9 years! Means it is really stable, right?
+
+* 4 minor enhancements:
+
+  * Removed a bunch of ancient cruft: getbyte, old 1.8 compile hacks, etc.
+  * Removed a bunch of forced deletions of ~/.ruby_inline in test. Cargo culting?
+  * Removed binary encoding on all source files and called #b for the few needed binary strings.
+  * Removed clean as a dependency for test, speeding up tests 3x.
+
+* 1 bug fix:
+
+  * Fix errors created when string literals are frozen.
+
+=== 1.2.1 / 2015-04-13
+
+WOW! SIX YEARS!!
+
+* 4 bug fixes:
+
+  * 1.9: quelled warnings
+  * 2.0: Added ascii-8bit encoding to test file to bypass new utf-8 default
+  * Rakefile cleanup. Use isolate. Nuke pathing.
+  * Removed dead rubyforge setting in Rakefile
+
 === 1.2.0 / 2009-06-23
 
 * 26 minor enhancements:
@@ -56,5 +82,7 @@
 
 === 1.0.0 / 2006-09-31
 
-* Birthday!
+* 1 major enhancement:
+
+  * Birthday!
 

data/README.txt

@@ -1,6 +1,8 @@
 = PNG
 
-* http://seattlerb.rubyforge.org/
+home :: https://github.com/seattlerb/png
+bugs :: https://github.com/seattlerb/png/issues
+doco :: http://docs.seattlerb.org/png
 
 == DESCRIPTION
 
@@ -14,20 +16,20 @@ without any C libraries.
 * Basic PNG reader as well (someday it might do compositing and the like!).
 * Almost pure ruby, does require a compiler.
 
-== SYNOPSYS
+== SYNOPSIS
+
+    require "png"
 
-    require 'png'
-    
     canvas = PNG::Canvas.new 200, 200
-    
+
     # Set a point to a color
     canvas[100, 100] = PNG::Color::Black
-    
+
     # draw an anti-aliased line
     canvas.line 50, 50, 100, 50, PNG::Color::Blue
-    
+
     png = PNG.new canvas
-    png.save 'blah.png'
+    png.save "blah.png"
 
 == REQUIREMENTS
 
@@ -37,13 +39,13 @@ without any C libraries.
 
 == INSTALL
 
-+ sudo gem install -y png
++ sudo gem install png
 
 == LICENSE
 
 (The MIT License)
 
-Copyright (c) 2006-2007 Ryan Davis, Eric Hodel, Zen Spider Software
+Copyright (c) Ryan Davis, Eric Hodel, Zen Spider Software
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,18 +1,15 @@
-$: << "../../RubyInline/dev/lib"
-$: << "../../hoe/dev/lib"
+require "hoe"
 
-require 'hoe'
-
-Hoe.add_include_dirs "../../hoe/dev/lib" # HACK remove
-Hoe.add_include_dirs "../../RubyInline/dev/lib", "lib"
 Hoe.plugin :seattlerb
 Hoe.plugin :inline
+Hoe.plugin :isolate
 
-Hoe.spec 'png' do
-  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
-  developer 'Eric Hodel', 'drbrain@segment7.net'
+Hoe.spec "png" do
+  developer "Ryan Davis", "ryand-ruby@zenspider.com"
 
-  self.rubyforge_name = 'seattlerb'
+  license "MIT"
 end
 
+task(:test).prerequisites.delete "clean" # TODO: consider removing from hoe?
+
 # vim: syntax=Ruby

data/example/lines.rb

@@ -1,7 +1,7 @@
 #!/usr/local/bin/ruby -w
 
-require 'png'
-require 'png/font'
+require "png"
+require "png/font"
 
 canvas = PNG::Canvas.new 201, 201, PNG::Color::White
 
@@ -13,8 +13,8 @@ canvas.line 100,  50, 200,  75, PNG::Color::Green
 canvas.line   0, 200, 200,   0, PNG::Color::Black
 canvas.line   0, 200, 150,   0, PNG::Color::Red
 
-canvas.annotate 'Hello World', 10, 10
+canvas.annotate "Hello World", 10, 10
 
 png = PNG.new canvas
-png.save 'blah.png'
+png.save "blah.png"
 `open blah.png`

data/example/profile.rb

@@ -1,4 +1,4 @@
-require 'png'
+require "png"
 
 class PNGProfile
 

data/example/profile_lines.rb

@@ -1,4 +1,4 @@
-require 'png'
+require "png"
 
 class PNGProfileLine
 

data/lib/png/font.rb

@@ -1,14 +1,12 @@
-# encoding: BINARY
-
-require 'png/reader'
+require "png/reader"
 
 ##
 # Implements a simple bitmap font by extracting letters from a PNG.
 
 class PNG::Font
-  LETTERS = (('A'..'Z').to_a +
-             ('a'..'z').to_a +
-             ('0'..'9').to_a + [" "] * 16 +
+  LETTERS = (("A".."Z").to_a +
+             ("a".."z").to_a +
+             ("0".."9").to_a + [" "] * 16 +
              '({[<!@#$%^&*?_+-=;,"/~>]})'.split(//))
 
   attr_reader :height, :width, :canvas
@@ -17,7 +15,7 @@ class PNG::Font
     @@default ||= new(File.join(File.dirname(__FILE__), "default_font.png"))
   end
 
-  def initialize(png_file)
+  def initialize png_file
     @canvas = PNG.load_file png_file
     @height, @width = canvas.height / 4, canvas.width / 26
     @cache = {}
@@ -50,8 +48,8 @@ class PNG::Canvas
   #
   #   require 'png/font'
 
-  def annotate(string, x, y,
-               font = PNG::Font.default, align = :left, style = :overwrite)
+  def annotate string, x, y,
+               font = PNG::Font.default, align = :left, style = :overwrite
     case align
     when :left then
       # do nothing

data/lib/png/pie.rb

@@ -1,12 +1,10 @@
-# encoding: BINARY
-
-require 'png'
+require "png"
 
 class PNG
   FULL = 360.0
   HALF = FULL / 2
 
-  def self.angle(x, y)
+  def self.angle x, y
     return 0 if x == 0 and y == 0
     rad_to_deg = 180.0 / Math::PI
     (Math.atan2(-y, x) * rad_to_deg + 90) % 360
@@ -20,25 +18,26 @@ class PNG
   #   system 'open pie.png'
 
   def self.pie_chart(diameter, pct_green,
-                good_color=PNG::Color::Green, bad_color=PNG::Color::Red)
-    diameter += 1 if diameter % 2 == 0
+                     good_color = PNG::Color::Green,
+                     bad_color = PNG::Color::Red)
+    diameter += 1 if diameter.even?
     radius = (diameter / 2.0).to_i
     pct_in_deg = FULL * pct_green
-    rad_to_deg = HALF / Math::PI
 
     canvas = PNG::Canvas.new(diameter, diameter)
 
     (-radius..radius).each do |x|
       (-radius..radius).each do |y|
         magnitude = Math.sqrt(x*x + y*y)
-        if magnitude <= radius then
-          angle = PNG.angle(x, y)
-          color = ((angle <= pct_in_deg) ? good_color : bad_color)
 
-          rx, ry = x+radius, y+radius
+        next if magnitude > radius
+
+        angle = PNG.angle(x, y)
+        color = ((angle <= pct_in_deg) ? good_color : bad_color)
+
+        rx, ry = x+radius, y+radius
 
-          canvas[ rx, ry ] = color
-        end
+        canvas[rx, ry] = color
       end
     end
 

data/lib/png/reader.rb

@@ -1,20 +1,18 @@
-# encoding: BINARY
-
-require 'png'
-require 'enumerator'
+require "png"
+require "enumerator"
 
 class PNG
   def self.load_file path, metadata_only = false
-    file = File.open(path, 'rb') { |f| f.read }
+    file = File.open(path, "rb") { |f| f.read }
     self.load file, metadata_only
   end
 
   def self.load png, metadata_only = false
     png = png.dup
     signature = png.slice! 0, 8
-    raise ArgumentError, 'Invalid PNG signature' unless signature == SIGNATURE
+    raise ArgumentError, "Invalid PNG signature" unless signature == SIGNATURE
 
-    ihdr = read_chunk 'IHDR', png
+    ihdr = read_chunk "IHDR", png
 
     bit_depth, color_type, width, height = read_IHDR ihdr, metadata_only
 
@@ -22,17 +20,17 @@ class PNG
 
     canvas = PNG::Canvas.new width, height
 
-    type = png.slice(4, 4).unpack('a4').first
-    read_chunk type, png if type == 'iCCP' # Ignore color profile
+    type = png.slice(4, 4).unpack("a4").first
+    read_chunk type, png if type == "iCCP" # Ignore color profile
 
-    read_IDAT read_chunk('IDAT', png), bit_depth, color_type, canvas
-    read_chunk 'IEND', png
+    read_IDAT read_chunk("IDAT", png), bit_depth, color_type, canvas
+    read_chunk "IEND", png
 
     canvas
   end
 
   def self.read_chunk expected_type, png
-    size, type = png.slice!(0, 8).unpack 'Na4'
+    size, type = png.slice!(0, 8).unpack "Na4"
     data, crc = png.slice!(0, size + 4).unpack "a#{size}N"
 
     check_crc type, data, crc
@@ -40,7 +38,7 @@ class PNG
     raise ArgumentError, "Expected #{expected_type} chunk, not #{type}" unless
       type == expected_type
 
-    return data
+    data
   end
 
   def self.check_crc type, data, crc
@@ -49,7 +47,7 @@ class PNG
   end
 
   def self.read_IHDR data, metadata_only = false
-    width, height, bit_depth, color_type, *rest = data.unpack 'N2C5'
+    width, height, bit_depth, color_type, *rest = data.unpack "N2C5"
 
     unless metadata_only then
       raise ArgumentError, "Wrong bit depth: #{bit_depth}" unless
@@ -64,7 +62,7 @@ class PNG
   end
 
   def self.read_IDAT data, bit_depth, color_type, canvas
-    data = Zlib::Inflate.inflate(data).unpack 'C*'
+    data = Zlib::Inflate.inflate(data).unpack "C*"
 
     pixel_size = color_type == RGBA ? 4 : 3
 

data/lib/png.rb

@@ -1,14 +1,5 @@
-# encoding: BINARY
-
-require 'rubygems'
-require 'zlib'
-require 'inline'
-
-unless "".respond_to? :getbyte then
-  class String
-    alias :getbyte :[]
-  end
-end
+require "zlib"
+require "inline"
 
 class String # :nodoc: # ZenTest SKIP
   inline do |builder|
@@ -16,6 +7,10 @@ class String # :nodoc: # ZenTest SKIP
       unsigned long png_crc() {
         static unsigned long crc[256];
         static char crc_table_computed = 0;
+        unsigned long c = 0xffffffff;
+        size_t   len    = RSTRING_LEN(self);
+        char * s        = StringValuePtr(self);
+        unsigned i;
 
         if (! crc_table_computed) {
           unsigned long c;
@@ -31,11 +26,6 @@ class String # :nodoc: # ZenTest SKIP
           crc_table_computed = 1;
         }
 
-        unsigned long c = 0xffffffff;
-        unsigned len    = RSTRING_LEN(self);
-        char * s        = StringValuePtr(self);
-        unsigned i;
-
         for (i = 0; i < len; i++) {
           c = crc[(c ^ s[i]) & 0xff] ^ (c >> 8);
         }
@@ -45,7 +35,7 @@ class String # :nodoc: # ZenTest SKIP
     EOM
   end
 rescue CompilationError => e
-  warn "COMPLIATION ERROR: #{e}"
+  warn "COMPILATION ERROR: #{e}"
 
   unless defined? @@crc then
     @@crc = Array.new(256)
@@ -61,12 +51,12 @@ rescue CompilationError => e
   ##
   # Calculates a CRC using the algorithm in the PNG specification.
 
-  def png_crc()
+  def png_crc
     c = 0xffffffff
     each_byte do |b|
       c = @@crc[(c^b) & 0xff] ^ (c >> 8)
     end
-    return c ^ 0xffffffff
+    c ^ 0xffffffff
   end
 end
 
@@ -99,7 +89,7 @@ end
 #   bottom left.
 
 class PNG
-  VERSION = '1.2.0'
+  VERSION = "1.3.0"
   SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack("C*")
 
   # Color Types:
@@ -118,21 +108,15 @@ class PNG
 
   begin
     inline do |builder|
-      if RUBY_VERSION < "1.8.6" then
-        builder.prefix <<-EOM
-          #define RARRAY_PTR(s) (RARRAY(s)->ptr)
-          #define RARRAY_LEN(s) (RARRAY(s)->len)
-        EOM
-      end
-
       builder.c <<-EOM
         VALUE png_join() {
-          int i, j;
-          VALUE data = rb_iv_get(self, "@data");
-          unsigned int data_len = RARRAY_LEN(data);
-          unsigned int row_len = RARRAY_LEN(RARRAY_PTR(data)[0]);
-          unsigned long size = data_len * (1 + (row_len * 4));
-          char * result = malloc(size);
+          size_t i, j;
+          VALUE  data     = rb_iv_get(self, "@data");
+          size_t data_len = RARRAY_LEN(data);
+          size_t row_len  = RARRAY_LEN(RARRAY_PTR(data)[0]);
+          size_t size     = data_len * (1 + (row_len * 4));
+          char * result   = malloc(size);
+
           unsigned long idx = 0;
           for (i = 0; i < data_len; i++) {
             VALUE row = RARRAY_PTR(data)[i];
@@ -153,21 +137,21 @@ class PNG
     end
   rescue CompilationError
     def png_join
-      @data.map { |row| "\0" + row.map { |p| p.values }.join }.join
+      @data.map { |row| "\0".b + row.map(&:values).join }.join
     end
   end
 
   ##
   # Creates a PNG chunk of type +type+ that contains +data+.
 
-  def self.chunk(type, data="")
+  def self.chunk type, data = ""
     [data.size, type, data, (type + data).png_crc].pack("Na*a*N")
   end
 
   ##
   # Creates a new PNG object using +canvas+
 
-  def initialize(canvas)
+  def initialize canvas
     @height = canvas.height
     @width = canvas.width
     @bits = 8
@@ -177,8 +161,8 @@ class PNG
   ##
   # Writes the PNG to +path+.
 
-  def save(path)
-    File.open path, 'wb' do |f|
+  def save path
+    File.open path, "wb" do |f|
       f.write to_blob
     end
   end
@@ -192,9 +176,9 @@ class PNG
     header = [@width, @height, @bits, RGBA, NONE, NONE, NONE]
 
     blob << SIGNATURE
-    blob << PNG.chunk('IHDR', header.pack("N2C5"))
-    blob << PNG.chunk('IDAT', Zlib::Deflate.deflate(self.png_join))
-    blob << PNG.chunk('IEND', '')
+    blob << PNG.chunk("IHDR", header.pack("N2C5"))
+    blob << PNG.chunk("IDAT", Zlib::Deflate.deflate(self.png_join))
+    blob << PNG.chunk("IEND", "")
     blob.join
   end
 
@@ -204,7 +188,7 @@ class PNG
 
   class Color
 
-    MAX=255
+    MAX = 0xFF
 
     attr_reader :values
 
@@ -214,7 +198,7 @@ class PNG
 
     def self.from str, name = nil
       str = "%08x" % str if Integer === str
-      colors = str.scan(/[\da-f][\da-f]/i).map { |n| n.hex }
+      colors = str.scan(/\h\h/i).map(&:hex)
       colors << name
       self.new(*colors)
     end
@@ -223,7 +207,7 @@ class PNG
     # Creates a new color with values +red+, +green+, +blue+, and +alpha+.
 
     def initialize red, green, blue, alpha = MAX, name = nil
-      @values = "%c%c%c%c" % [red, green, blue, alpha]
+      @values = "%c%c%c%c" % [red, green, blue, alpha].map(&:chr)
       @name = name
     end
 
@@ -255,8 +239,8 @@ class PNG
     # "Bitwise or" as applied to colors. Background color is
     # considered false.
 
-    def | o
-      self == Background ? o : self
+    def | other
+      self == Background ? other : self
     end
 
     def hash # :nodoc:
@@ -294,15 +278,17 @@ class PNG
     # Blends +color+ into this color returning a new blended color.
 
     def blend color
-      return Color.new(((r + color.r) / 2), ((g + color.g) / 2),
-                       ((b + color.b) / 2), ((a + color.a) / 2))
+      Color.new(((r + color.r) / 2),
+                ((g + color.g) / 2),
+                ((b + color.b) / 2),
+                ((a + color.a) / 2))
     end
 
     ##
     # Returns a new color with an alpha value adjusted by +i+.
 
     def intensity i
-      return Color.new(r,g,b,(a*i) >> 8)
+      Color.new(r, g, b, (a*i) >> 8)
     end
 
     def inspect # :nodoc:
@@ -318,11 +304,11 @@ class PNG
     # art!
 
     def to_ascii
-      return '  ' if a == 0x00
+      return "  " if a == 0x00
 
       brightness = (((r + g + b) / 3) * a) / 0xFF
 
-      %w(.. ,, ++ 00)[brightness / 64]
+      %w[.. ,, ++ 00][brightness / 64]
     end
 
     def to_s # :nodoc:
@@ -341,26 +327,26 @@ class PNG
       unless s == 0.0 then
         h += 255 if h < 0
         h  = h / 255.0 * 6.0
-        s  = s / 255.0
-        v  = v / 255.0
+        s  /= 255.0
+        v  /= 255.0
         i  = h.floor
         f  = h - i
         p = v * (1 - (s))
         q = v * (1 - (s * (f)))
         w = v * (1 - (s * (1-f)))
         r, g, b = case i
-                  when 0,6 then
-                    [ v, w, p ]
+                  when 0, 6 then
+                    [v, w, p]
                   when 1 then
-                    [ q, v, p ]
+                    [q, v, p]
                   when 2 then
-                    [ p, v, w ]
+                    [p, v, w]
                   when 3 then
-                    [ p, q, v ]
+                    [p, q, v]
                   when 4 then
-                    [ w, p, v ]
+                    [w, p, v]
                   when 5 then
-                    [ v, p, q ]
+                    [v, p, q]
                   else
                     raise [h, s, v, i, f, p, q, w].inspect
                   end
@@ -420,7 +406,7 @@ class PNG
     def initialize width, height, background = Color::Background
       @width = width
       @height = height
-      @data = Array.new(@height) { |x| Array.new(@width, background) }
+      @data = Array.new(@height) { Array.new(@width, background) }
     end
 
     ##
@@ -489,14 +475,14 @@ class PNG
     end
 
     def inspect # :nodoc:
-      '#<%s %dx%d>' % [self.class, @width, @height]
+      "#<%s %dx%d>" % [self.class, @width, @height]
     end
 
     ##
     # Blends +color+ onto the color at point (+x+, +y+).
 
-    def point(x, y, color)
-      self[x,y] = self[x,y].blend(color)
+    def point x, y, color
+      self[x, y] = self[x, y].blend(color)
     end
 
     ##
@@ -504,7 +490,7 @@ class PNG
     #
     # http://en.wikipedia.org/wiki/Xiaolin_Wu's_line_algorithm
 
-    def line(x0, y0, x1, y1, color)
+    def line x0, y0, x1, y1, color
       y0, y1, x0, x1 = y1, y0, x1, x0 if y0 > y1
       dx = x1 - x0
       sx = dx < 0 ? -1 : 1
@@ -513,7 +499,7 @@ class PNG
 
       # 'easy' cases
       if dy == 0 then
-        Range.new(*[x0,x1].sort).each do |x|
+        Range.new(*[x0, x1].sort).each do |x|
           point(x, y0, color)
         end
         return
@@ -539,12 +525,12 @@ class PNG
       e_acc = 0
       if dy > dx then # vertical displacement
         e = (dx << 16) / dy
-        (y0...y1-1).each do |i|
+        (y0...y1-1).each do
           e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xFFFF
-          x0 = x0 + sx if (e_acc <= e_acc_temp)
+          x0 += sx if (e_acc <= e_acc_temp)
           w = 0xFF-(e_acc >> 8)
           point(x0, y0, color.intensity(w))
-          y0 = y0 + 1
+          y0 += 1
           point(x0 + sx, y0, color.intensity(0xFF-w))
         end
         point(x1, y1, color)
@@ -553,7 +539,7 @@ class PNG
 
       # horizontal displacement
       e = (dy << 16) / dx
-      (dx - 1).downto(0) do |i|
+      (dx - 1).downto(0) do
         e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xFFFF
         y0 += 1 if (e_acc <= e_acc_temp)
         w = 0xFF-(e_acc >> 8)
@@ -580,7 +566,7 @@ class PNG
         image << "\n"
       end
 
-      return image.join
+      image.join
     end
   end # Canvas
 end