png 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6a402194fe1cbe6b3c0046da8f2762b0eb663dfb
-  data.tar.gz: 3abefbe75ec174dae717a1f951fb1f052fca2a4e
+SHA256:
+  metadata.gz: ed4cb5ea785c269b2b1528b2630d99b24a3bc99a06c4a50961dc3c681959a169
+  data.tar.gz: f0a06a6423b7159878cbf5ed844e3600e32fec055e9fa46ace12e7d2329a474d
 SHA512:
-  metadata.gz: 90dde7c2914c3b20dd54ff1b0bb1a358fffe9896ef5fa13663c44cc3d2dac64e9db53687b7144e7fb14806d009baea163259c51eac8d03e510b2136325f35d1b
-  data.tar.gz: 00531adf917fae6c8cb8d082189dc40584bbc8152c93ad7d0126c740dd9d1f4e4984ac692402b69b79df378b8c30b482e29831845dac0ebcea8a97186866a833
+  metadata.gz: f281dfb508c5c4ccc5bd82b69e69266b8931e198fa0a8deef3b47d3d13e22ca75b66b9df0d4d37ab44b9581fe3db8b9ef74a00f75a274afa6c1da9a0e8e49f0e
+  data.tar.gz: 6b9c5ad8ba80a4c8ed527b56c271de1529b541c9b0f4dac533dc1568a2cf9263f3800ff51336de65e6d3aa94f2c7f7747dacbfd852108495716e69858efa95e9

data/History.txt

@@ -1,3 +1,18 @@
+=== 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!!

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
 
@@ -16,18 +18,18 @@ without any C libraries.
 
 == 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

@@ -6,6 +6,10 @@ Hoe.plugin :isolate
 
 Hoe.spec "png" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
+
+  license "MIT"
 end
 
+task(:test).prerequisites.delete "clean" # TODO: consider removing from hoe?
+
 # vim: syntax=Ruby

data/lib/png/font.rb

@@ -1,5 +1,3 @@
-# encoding: BINARY
-
 require "png/reader"
 
 ##

data/lib/png/pie.rb

@@ -1,5 +1,3 @@
-# encoding: BINARY
-
 require "png"
 
 class PNG

data/lib/png/reader.rb

@@ -1,5 +1,3 @@
-# encoding: BINARY
-
 require "png"
 require "enumerator"
 

data/lib/png.rb

@@ -1,15 +1,6 @@
-# encoding: BINARY
-
-require "rubygems"
 require "zlib"
 require "inline"
 
-unless "".respond_to? :getbyte then
-  class String
-    alias :getbyte :[]
-  end
-end
-
 class String # :nodoc: # ZenTest SKIP
   inline do |builder|
     builder.c <<-EOM
@@ -98,7 +89,7 @@ end
 #   bottom left.
 
 class PNG
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
   SIGNATURE = [137, 80, 78, 71, 13, 10, 26, 10].pack("C*")
 
   # Color Types:
@@ -117,13 +108,6 @@ 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() {
           size_t i, j;
@@ -153,7 +137,7 @@ class PNG
     end
   rescue CompilationError
     def png_join
-      @data.map { |row| "\0" + row.map(&:values).join }.join
+      @data.map { |row| "\0".b + row.map(&:values).join }.join
     end
   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(&: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
 
@@ -294,8 +278,10 @@ class PNG
     # Blends +color+ into this color returning a new blended color.
 
     def blend color
-      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
 
     ##

data/test/test_png.rb

@@ -1,13 +1,3 @@
-# encoding: ascii-8bit
-
-dir = File.expand_path "~/.ruby_inline"
-if File.directory? dir then
-  require "fileutils"
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
 require "minitest/autorun"
 require "rubygems"
 require "png"
@@ -28,10 +18,10 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
   def test_class_chunk
     chunk = PNG.chunk "IHDR", [10, 10, 8, 6, 0, 0, 0].pack("N2C5")
 
-    header_crc = "\2152\317\275"
-    header_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000"
-    header_length = "\000\000\000\r"
-    header_chunk = "#{header_length}IHDR#{header_data}#{header_crc}"
+    header_crc = "\2152\317\275".b
+    header_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000".b
+    header_length = "\000\000\000\r".b
+    header_chunk = "#{header_length}IHDR#{header_data}#{header_crc}".b
 
     assert_equal header_chunk, chunk
   end
@@ -490,32 +480,26 @@ class TestPng::TestPie < Minitest::Test
     assert_equal expected, actual.to_s
   end
 
-  def util_angle expect, x, y
+  def assert_angle expect, x, y
     actual = PNG.angle(x, y)
-    case expect
-    when Integer then
-      assert_equal(expect, actual,
-                   "[#{x}, #{y}] should be == #{expect}, was #{actual}")
-    else
-      assert_in_delta(expect, actual, 0.5)
-    end
+    assert_in_epsilon expect, actual
   end
 
   def test_math_is_hard_lets_go_shopping
-    util_angle   0,  0,  0
+    assert_angle   0,  0,  0
     (25..500).step(25) do |n|
-      util_angle   0,  0,  n
-      util_angle  90,  n,  0
-      util_angle 180,  0, -n
-      util_angle 270, -n,  0
+      assert_angle   0,  0,  n
+      assert_angle  90,  n,  0
+      assert_angle 180,  0, -n
+      assert_angle 270, -n,  0
     end
 
-    util_angle 359.5, -1, 250
-    util_angle   0.0,  0, 250
-    util_angle   0.5,  1, 250
+    assert_angle 359.5, -1, 250
+    assert_angle   0.0,  0, 250
+    assert_angle   0.2292,  1, 250
 
-    util_angle 89.5, 250,  1
-    util_angle 90.0, 250,  0
-    util_angle 90.5, 250, -1
+    assert_angle 89.77, 250,  1
+    assert_angle 90.0, 250,  0
+    assert_angle 90.23, 250, -1
   end
 end

data/test/test_png_font.rb

@@ -1,11 +1,3 @@
-dir = File.expand_path "~/.ruby_inline"
-if File.directory? dir then
-  require "fileutils"
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
 require "rubygems"
 require "minitest/autorun"
 require "png/font"

data/test/test_png_reader.rb

@@ -1,11 +1,3 @@
-dir = File.expand_path "~/.ruby_inline"
-if File.directory? dir then
-  require "fileutils"
-  puts "nuking #{dir}"
-  # force removal, Windoze is bitching at me, something to hunt later...
-  FileUtils.rm_r dir, :force => true
-end
-
 require "rubygems"
 require "minitest/autorun"
 require "png/reader"
@@ -41,7 +33,7 @@ jwUwDGVBALuJxzlQugpEAAAAAElFTkSuQmCC
   end
 
   def test_class_read_chunk
-    data = PNG.read_chunk "IHDR", @IHDR_chunk
+    data = PNG.read_chunk "IHDR", @IHDR_chunk.dup
 
     assert_equal @IHDR_data, data
   end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: png
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,72 +21,64 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '4.2'
 description: |-
   PNG is an almost-pure-ruby PNG library. It lets you write a PNG
   without any C libraries.
@@ -99,7 +91,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -115,30 +106,32 @@ files:
 - test/test_png.rb
 - test/test_png_font.rb
 - test/test_png_reader.rb
-homepage: http://seattlerb.rubyforge.org/
+homepage: https://github.com/seattlerb/png
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/png
+  bug_tracker_uri: https://github.com/seattlerb/png/issues
+  documentation_uri: http://docs.seattlerb.org/png
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.5.15
+signing_key:
 specification_version: 4
 summary: PNG is an almost-pure-ruby PNG library
 test_files: []

metadata.gz.sig

@@ -1 +1,2 @@
-v������e�\�&9uO�f�4YgkS����[K�R���`�4���k��y�+���G綘�j���C/c�L|S�B3.Zp��2��I����[����ER��%vy&�k.����XV ��'}�o�o��xo
+
+��4KvD�A�k�����s�wV��4x�m�~��U_���`%�;&�;��% nL��l}��Cq�r�!J�2R�����?�mIwa�6�{"�|�����.p�`8gjb�Hd�an(y��pzF?��3��x��z`����#�=�A��������^����C3���Sg�2�.O(�O���d�5C�e(1