image_size 1.4.2 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWEzNGYyODYwNmFkZTE1ZGEzOTA0YmVlZmNiZWE1MmE0NjExZjYzOQ==
-  data.tar.gz: !binary |-
-    YTAzMDA3MTIzYzJjYzgxNDIyNjRjZTlhMmNlZDFlNTY3MzU3MmQyOA==
+SHA256:
+  metadata.gz: 9ecfd6172b63860fd5e18bf96cdfc79c7ab275f52643d6069ef4386978a70187
+  data.tar.gz: c0be8f8fea7b00fb2ad849598fb461238942a836f89dd63edc452432637e1fd5
 SHA512:
-  metadata.gz: !binary |-
-    NWQ2YTNiNjFiNmY0ZGJiNWZkYjBiODQzMmE5Y2I5NjhkMGVmMzdhMGIyZmEz
-    MjI1NjRiNDFkMTE1ZGE3YzZmYjgwYTcyYmE2NDg5ZWY2YWM2NWVkZGEwNDVj
-    OWIyM2M0NjIwMmE5Y2Y1YzY5OWM4NTdlMjA4ZjQxMGMxYzNjMmI=
-  data.tar.gz: !binary |-
-    MTI2YTEwM2IzNTAwYmExNGE5MTE1NGUyNGQyNTFlNTFiMTA2NzEyYzNlZDYw
-    MzMzYzFmMTQ4NjY0ZWI2YmUxNGNkYWJlYWVlMjZiMzZmNDczOTU0NDJlZTM2
-    ODUzZGUxYWJkYTEyOGIwNDdlYTQzNjdmOWQyMmUzNWEzYzIyMDE=
+  metadata.gz: 1536d248784158f8163a3fd7cde488af4a5dbd6e5ccfde7e40e491f5679db4bdd87a0834de00c077d3312090e36c677d6df29fed85cd3b45596b1303831fb33b
+  data.tar.gz: 2251c45b938da475db4a03ea570bdc3e2b513309817a874c9e0b4b458b83d67f7687af691a84a6f98aaa39de6241a5e4dc8f8177552f0ac9e051b494626398e0

data/.rubocop.yml

@@ -0,0 +1,80 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - '*.gemspec'
+  NewCops: enable
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Layout/LineLength:
+  Max: 120
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
+
+Lint/PercentStringArray: # broken in rubocop 0.55.0
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: false
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/EmptyCaseCondition:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/UnpackFirst:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,28 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 0.89.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 8
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 43
+
+# Offense count: 5
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 21
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 21
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'lib/image_size.rb'

data/.travis.yml

@@ -1,10 +1,27 @@
+sudo: false
+dist: trusty
 language: ruby
+before_install:
+  - gem install bundler || gem install bundler --version '< 2'
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-18mode
-  - jruby-19mode
-  - ree
-script: "bundle exec rspec"
+  - '1.8.7-p374'
+  - '1.9.3-p551'
+  - '2.0.0-p648'
+  - '2.1.10'
+  - '2.2.10'
+  - '2.3.8'
+  - '2.4.10'
+  - '2.5.8'
+  - '2.6.6'
+  - '2.7.1'
+  - 'jruby-9.1.17.0'
+  - 'jruby-9.2.11.1'
+script: bundle exec rspec
+matrix:
+  include:
+    - env: RUBOCOP=1
+      rvm: '2.6.6'
+      script: bundle exec rubocop
+    - env: CHECK_RUBIES=1
+      rvm: '2.6.6'
+      script: bundle exec travis_check_rubies

data/CHANGELOG.markdown

@@ -0,0 +1,117 @@
+# ChangeLog
+
+## unreleased
+
+## v2.1.0 (2020-08-09)
+
+* Add handling of JPEG 2000: part 1 (jp2), part 2 (jpx) and codestream (j2c) [#13](https://github.com/toy/image_size/issues/13) [@toy](https://github.com/toy)
+* Correct handling of pam images and cleanup handling of Netpbm images (pbm, pgm, pnm) [@toy](https://github.com/toy)
+
+## v2.0.2 (2019-07-14)
+
+* Remove deprecated `rubyforge_project` attribute from gemspec [rubygems/rubygems#2436](https://github.com/rubygems/rubygems/pull/2436) [@toy](https://github.com/toy)
+
+## v2.0.1 (2019-05-17)
+
+* Adapt to frozen string literals [@toy](https://github.com/toy)
+
+## v2.0.0 (2018-05-01)
+
+* Allow any class responding to `read` and `eof?` to be passed to `ImageSize` [@toy](https://github.com/toy)
+* Introduce `rubocop` [@toy](https://github.com/toy)
+* Use `File.open` instead of `Kernel#open` [@toy](https://github.com/toy)
+* Don’t rewind `IO` before or after usage [@toy](https://github.com/toy)
+* Enhance readme [@toy](https://github.com/toy)
+
+## v1.5.0 (2016-11-20)
+
+* Support `WEBP` images [@toy](https://github.com/toy)
+* Cleanup `GIF`, `PPM` and `SWF` magic number matching [@toy](https://github.com/toy)
+* Fix `GIF` magic number (matched `GIF8,a`) [@toy](https://github.com/toy)
+* Detect `APNG` images by `acTL` chunk [@toy](https://github.com/toy)
+* Support `MNG` images [@toy](https://github.com/toy)
+
+## v1.4.2 (2016-02-18)
+
+* Fixed license in gemspec to be Ruby [#10](https://github.com/toy/image_size/issues/10) [@toy](https://github.com/toy)
+
+## v1.4.1 (2014-11-19)
+
+* Missed `ICO` and `CUR` in description [@toy](https://github.com/toy)
+
+## v1.4.0 (2014-11-19)
+
+* Detecting `ICO` and `CUR` images [@toy](https://github.com/toy)
+
+## v1.3.1 (2014-06-24)
+
+* Fix reading `JPEGs` with extraneous bytes [@toy](https://github.com/toy)
+
+## v1.3.0 (2014-04-06)
+
+* Raise `FormatError` instead of `RuntimeError` [@toy](https://github.com/toy)
+
+## v1.2.0 (2014-02-01)
+
+* Basic handling of `SVG` (only width and height attributes) [@toy](https://github.com/toy)
+* Enhance matching `PCX` [@toy](https://github.com/toy)
+
+## v1.1.5 (2013-12-23)
+
+* Fix reading dimensions of `BMP v2` and `BMP v3` [@toy](https://github.com/toy)
+* Fix swapped `PSD` width (columns) and height (rows) [#9](https://github.com/toy/image_size/issues/9) [@toy](https://github.com/toy)
+* Replace square test images with rectangle ones [@toy](https://github.com/toy)
+
+## v1.1.4 (2013-11-05)
+
+* Close instead of only rewinding `IO` instances [@toy](https://github.com/toy)
+* Add `.travis.yml` and supporting files [#8](https://github.com/toy/image_size/pull/8) [@petergoldstein](https://github.com/petergoldstein)
+
+## v1.1.3 (2013-07-24)
+
+* Enforce binary encoding of data returned by `ImageReader#[]` [#6](https://github.com/toy/image_size/issues/6) [@toy](https://github.com/toy)
+
+## v1.1.2 (2013-02-24)
+
+* Explicitly set encoding to `ASCII-8BIT` as for `ruby2.0.0-p0` it will be `UTF-8` by default [#5](https://github.com/toy/image_size/pull/5) [@walf443](https://github.com/walf443)
+
+## v1.1.1 (2012-06-19)
+
+* Fix exception in message for exception [#3](https://github.com/toy/image_size/pull/3) [@yachi](https://github.com/yachi)
+
+## v1.1.0 (2012-02-25)
+
+* Rework most code [@toy](https://github.com/toy)
+* `Size` class instead of dynamically adding `to_s` method to size array [@toy](https://github.com/toy)
+* `ImageSize.path`, more examples [@toy](https://github.com/toy)
+* Added support for `Tempfile`, as well as fixed bug when running `ImageSize` on the same `IO` stream twice [#2](https://github.com/toy/image_size/pull/2) [@kanevski](https://github.com/kanevski)
+
+## v1.0.6 (2012-02-08)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.5 (2012-02-04)
+
+* Fix getting `SWF` dimensions for ruby 1.9 [@toy](https://github.com/toy)
+* Fix determining `PCX` for ruby1.9 [@toy](https://github.com/toy)
+* Enhance `SWF` checking [@toy](https://github.com/toy)
+
+## v1.0.4 (2011-12-16)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.3 (2011-02-21)
+
+* Fix permissions on `lib/image_size.rb` from `700` to `644` [#1](https://github.com/toy/image_size/issues/1) [@toy](https://github.com/toy)
+
+## v1.0.2 (2010-12-15)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.1 (2010-12-15)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.0 (2010-11-01)
+
+* Initial commit [@toy](https://github.com/toy)

data/Gemfile

@@ -1,3 +1,9 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 gemspec
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/README.markdown

@@ -1,40 +1,87 @@
+[![Gem Version](https://img.shields.io/gem/v/image_size.svg?style=flat)](https://rubygems.org/gems/image_size)
+[![Build Status](https://img.shields.io/travis/toy/image_size/master.svg?style=flat)](https://travis-ci.org/toy/image_size)
+
 # image_size
 
 measure image size using pure Ruby
-formats: `bmp`, `cur`, `gif`, `jpeg`, `ico`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `swf`, `tiff`, `xbm`, `xpm`
+formats: `apng`, `bmp`, `cur`, `gif`, `ico`, `j2c`, `jp2`, `jpeg`, `jpx`, `mng`, `pam`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `svg`, `swf`, `tiff`, `webp`, `xbm`, `xpm`
+
+## Installation
 
-[![Build Status](https://travis-ci.org/toy/image_size.png?branch=master)](https://travis-ci.org/toy/image_size)
+```sh
+gem install image_size
+```
 
-## Download
+### Bundler
 
-The latest version of image\_size can be found at http://github.com/toy/image_size
+Add to your `Gemfile`:
 
-## Installation
+```ruby
+gem 'image_size', '~> 2.0'
+```
+
+## Usage
+
+```ruby
+image_size = ImageSize.path('spec/test.jpg')
+
+image_size.format       #=> :jpec
+image_size.width        #=> 320
+image_size.height       #=> 240
+image_size.w            #=> 320
+image_size.h            #=> 240
+image_size.size         #=> [320, 240]
+```
+
+Or using `IO` object:
+
+```ruby
+image_size = File.open('spec/test.jpg', 'rb'){ |fh| ImageSize.new(fh) }
+```
+
+Any object responding to `read` and `eof?`:
+
+```ruby
+require 'image_size'
+
+image_size = ImageSize.new(ARGF)
+```
+
+Works with `open-uri` if needed:
 
-    gem install image_size
+```ruby
+require 'image_size'
+require 'open-uri'
 
-## Examples
+image_size = URI.parse('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg').open('rb') do |fh|
+  ImageSize.new(fh)
+end
 
-    require 'image_size'
+image_size = open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
+  ImageSize.new(fh)
+end
+```
 
-    p ImageSize.path('spec/test.jpg').size
+Note that starting with version `2.0.0` the object given to `ImageSize` will not be rewound before or after use.
+So rewind if needed before passing to `ImageSize` and/or rewind after passing to `ImageSize` before reading data.
 
-    open('spec/test.jpg', 'rb') do |fh|
-      p ImageSize.new(fh).size
-    end
+```ruby
+require 'image_size'
 
+File.open('spec/test.jpg', 'rb') do |fh|
+  image_size = ImageSize.new(fh)
 
-    require 'image_size'
-    require 'open-uri'
+  fh.rewind
+  data = fh.read
+end
 
-    open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
-      p ImageSize.new(fh).size
-    end
+File.open('spec/test.jpg', 'rb') do |fh|
+  data = fh.read
+  fh.rewind
 
-    open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
-      data = fh.read
-      p ImageSize.new(data).size
-    end
+  image_size = ImageSize.new(fh)
+end
+```
 
 ## Licence
 
@@ -43,3 +90,4 @@ This code is free to use under the terms of the Ruby's licence.
 ## Contact
 
 Original author: "Keisuke Minami": mailto:keisuke@rccn.com
+Further development by Ivan Kuchin https://github.com/toy/image_size

data/image_size.gemspec

@@ -2,14 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.4.2'
+  s.version     = '2.1.0'
   s.summary     = %q{Measure image size using pure Ruby}
-  s.description = %q{Measure following file dimensions: bmp, cur, gif, jpeg, ico, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm}
-  s.homepage    = "http://github.com/toy/#{s.name}"
+  s.description = %q{Measure following file dimensions: apng, bmp, cur, gif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Keisuke Minami', 'Ivan Kuchin']
   s.license     = 'Ruby'
 
-  s.rubyforge_project = s.name
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'changelog_uri'     => "https://github.com/toy/#{s.name}/blob/master/CHANGELOG.markdown",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -17,4 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
+  if RUBY_VERSION >= '2.2'
+    s.add_development_dependency 'rubocop', '~> 0.59', '!= 0.78.0'
+  end
 end

data/lib/image_size.rb

@@ -1,11 +1,13 @@
-# -- coding: ASCII-8BIT --
-#
+# encoding: BINARY
+# frozen_string_literal: true
+
 require 'stringio'
-require 'tempfile'
 
+# Determine image format and size
 class ImageSize
   class FormatError < StandardError; end
 
+  # Array joining with 'x'
   class Size < Array
     # join using 'x'
     def to_s
@@ -15,34 +17,26 @@ class ImageSize
 
   class ImageReader # :nodoc:
     attr_reader :data
+
     def initialize(data_or_io)
-      @io = case data_or_io
-      when IO, StringIO, Tempfile
-        data_or_io.dup.tap(&:rewind)
-      when String
+      @io = if data_or_io.is_a?(String)
         StringIO.new(data_or_io)
+      elsif data_or_io.respond_to?(:read) && data_or_io.respond_to?(:eof?)
+        data_or_io
       else
-        raise ArgumentError.new("expected instance of IO, StringIO, Tempfile or String, got #{data_or_io.class}")
+        raise ArgumentError, "expected data as String or an object responding to read and eof?, got #{data_or_io.class}"
       end
-      @read = 0
-      @data = ''
-    end
-
-    def close
-      @io.rewind
-      @io.close if IO === @io
+      @data = String.new # not frozen
     end
 
     CHUNK = 1024
     def [](offset, length)
-      while offset + length > @read
-        @read += CHUNK
-        if data = @io.read(CHUNK)
-          if data.respond_to?(:encoding)
-            data.force_encoding(@data.encoding)
-          end
-          @data << data
-        end
+      while !@io.eof? && @data.length < offset + length
+        data = @io.read(CHUNK)
+        break unless data
+
+        data.force_encoding(@data.encoding) if data.respond_to?(:encoding)
+        @data << data
       end
       @data[offset, length]
     end
@@ -50,7 +44,7 @@ class ImageSize
 
   # Given path to image finds its format, width and height
   def self.path(path)
-    open(path, 'rb'){ |f| new(f) }
+    File.open(path, 'rb'){ |f| new(f) }
   end
 
   # Used for svg
@@ -63,13 +57,13 @@ class ImageSize
     @dpi = dpi.to_f
   end
 
-  # Given image as IO, StringIO, Tempfile or String finds its format and dimensions
+  # Given image as any class responding to read and eof? or data as String, finds its format and dimensions
   def initialize(data)
     ir = ImageReader.new(data)
-    if @format = detect_format(ir)
-      @width, @height = self.send("size_of_#{@format}", ir)
-    end
-    ir.close
+    @format = detect_format(ir)
+    return unless @format
+
+    @width, @height = send("size_of_#{@format}", ir)
   end
 
   # Image format
@@ -77,42 +71,75 @@ class ImageSize
 
   # Image width
   attr_reader :width
-  alias :w :width
+  alias_method :w, :width
 
   # Image height
   attr_reader :height
-  alias :h :height
+  alias_method :h, :height
 
   # get image width and height as an array which to_s method returns "#{width}x#{height}"
   def size
-    if format
-      Size.new([width, height])
-    end
+    Size.new([width, height]) if format
   end
 
 private
 
-  SVG_R = /<svg\b([^>]*)>/
+  SVG_R = /<svg\b([^>]*)>/.freeze
+  XML_R = /<\?xml|<!--/.freeze
   def detect_format(ir)
     head = ir[0, 1024]
     case
-    when head =~ /^GIF8[7,9]a/              then :gif
-    when head[0, 8] == "\211PNG\r\n\032\n"  then :png
-    when head[0, 2] == "\377\330"           then :jpeg
-    when head[0, 2] == 'BM'                 then :bmp
-    when head =~ /^P[1-7]/                  then :ppm
-    when head =~ /\#define\s+\S+\s+\d+/     then :xbm
-    when head[0, 4] == "II*\000"            then :tiff
-    when head[0, 4] == "MM\000*"            then :tiff
-    when head =~ /\/\* XPM \*\//            then :xpm
-    when head[0, 4] == '8BPS'               then :psd
-    when head =~ /^[FC]WS/                  then :swf
-    when head[SVG_R] ||
-      head =~ /<\?xml|<!--/ && ir[0, 4096][SVG_R]
-                                            then :svg
-    when head[0, 2] =~ /\n[\000-\005]/      then :pcx
-    when head[0, 4] == "\000\000\001\000"   then :ico
-    when head[0, 4] == "\000\000\002\000"   then :cur
+    when head[0, 6] =~ /GIF8[79]a/                                then :gif
+    when head[0, 8] == "\211PNG\r\n\032\n"                        then detect_png_type(ir)
+    when head[0, 8] == "\212MNG\r\n\032\n"                        then :mng
+    when head[0, 2] == "\377\330"                                 then :jpeg
+    when head[0, 2] == 'BM'                                       then :bmp
+    when head[0, 3] =~ /P[1-6]\s|P7\n/                            then detect_pnm_type(ir)
+    when head =~ /\#define\s+\S+\s+\d+/                           then :xbm
+    when %W[II*\0 MM\0*].include?(head[0, 4])                     then :tiff
+    when head =~ %r{/\* XPM \*/}                                  then :xpm
+    when head[0, 4] == '8BPS'                                     then :psd
+    when head[0, 3] =~ /[FC]WS/                                   then :swf
+    when head =~ SVG_R || (head =~ XML_R && ir[0, 4096][SVG_R])   then :svg
+    when head[0, 2] =~ /\n[\0-\5]/                                then :pcx
+    when head[0, 12] =~ /RIFF(?m:....)WEBP/                       then :webp
+    when head[0, 4] == "\0\0\1\0"                                 then :ico
+    when head[0, 4] == "\0\0\2\0"                                 then :cur
+    when head[0, 12] == "\0\0\0\fjP  \r\n\207\n"                  then detect_jpeg2000_type(ir)
+    when head[0, 4] == "\377O\377Q"                               then :j2c
+    end
+  end
+
+  def detect_png_type(ir)
+    offset = 8
+    loop do
+      type = ir[offset + 4, 4]
+      break if ['IDAT', 'IEND', nil].include?(type)
+      return :apng if type == 'acTL'
+
+      length = ir[offset, 4].unpack('N')[0]
+      offset += 8 + length + 4
+    end
+    :png
+  end
+
+  def detect_pnm_type(ir)
+    case ir[0, 2]
+    when 'P1', 'P4' then :pbm
+    when 'P2', 'P5' then :pgm
+    when 'P3', 'P6' then :ppm
+    when 'P7'       then :pam
+    end
+  end
+
+  def detect_jpeg2000_type(ir)
+    return unless ir[16, 4] == 'ftyp'
+
+    # using xl-box would be weird, but doesn't seem to contradict specification
+    skip = ir[12, 4] == "\0\0\0\1" ? 16 : 8
+    case ir[12 + skip, 4]
+    when 'jp2 ' then :jp2
+    when 'jpx ' then :jpx
     end
   end
 
@@ -120,19 +147,29 @@ private
     ir[6, 4].unpack('vv')
   end
 
+  def size_of_mng(ir)
+    unless ir[12, 4] == 'MHDR'
+      raise FormatError, 'MHDR not in place for MNG'
+    end
+
+    ir[16, 8].unpack('NN')
+  end
+
   def size_of_png(ir)
     unless ir[12, 4] == 'IHDR'
       raise FormatError, 'IHDR not in place for PNG'
     end
+
     ir[16, 8].unpack('NN')
   end
-
-  JpegCodeCheck = [
-    "\xc0", "\xc1", "\xc2", "\xc3",
-    "\xc5", "\xc6", "\xc7",
-    "\xc9", "\xca", "\xcb",
-    "\xcd", "\xce", "\xcf",
-  ] # :nodoc:
+  alias_method :size_of_apng, :size_of_png
+
+  JPEG_CODE_CHECK = %W[
+    \xC0 \xC1 \xC2 \xC3
+    \xC5 \xC6 \xC7
+    \xC9 \xCA \xCB
+    \xCD \xCE \xCF
+  ].freeze
   def size_of_jpeg(ir)
     section_marker = "\xFF"
     offset = 2
@@ -141,12 +178,13 @@ private
       offset += 1 until section_marker != ir[offset + 1, 1]
       raise FormatError, 'EOF in JPEG' if ir[offset, 1].nil?
 
-      marker, code, length = ir[offset, 4].unpack('aan')
+      _marker, code, length = ir[offset, 4].unpack('aan')
       offset += 4
 
-      if JpegCodeCheck.include?(code)
+      if JPEG_CODE_CHECK.include?(code)
         return ir[offset + 1, 4].unpack('nn').reverse
       end
+
       offset += length - 2
     end
   end
@@ -170,12 +208,38 @@ private
     header = ir[0, 1024]
     header.gsub!(/^\#[^\n\r]*/m, '')
     header =~ /^(P[1-6])\s+?(\d+)\s+?(\d+)/m
-    case $1
-      when 'P1', 'P4' then @format = :pbm
-      when 'P2', 'P5' then @format = :pgm
-    end
     [$2.to_i, $3.to_i]
   end
+  alias_method :size_of_pbm, :size_of_ppm
+  alias_method :size_of_pgm, :size_of_ppm
+
+  def size_of_pam(ir)
+    width = height = nil
+    offset = 3
+    loop do
+      if ir[offset, 1] == '#'
+        offset += 1 until ["\n", '', nil].include?(ir[offset, 1])
+        offset += 1
+      else
+        chunk = ir[offset, 32]
+        case chunk
+        when /\AWIDTH (\d+)\n/
+          width = $1.to_i
+        when /\AHEIGHT (\d+)\n/
+          height = $1.to_i
+        when /\AENDHDR\n/
+          break
+        when /\A(?:DEPTH|MAXVAL) \d+\n/, /\ATUPLTYPE \S+\n/
+          # ignore
+        else
+          raise FormatError, "Unexpected data in PAM header: #{chunk.inspect}"
+        end
+        offset += $&.length
+        break if width && height
+      end
+    end
+    [width, height]
+  end
 
   def size_of_xbm(ir)
     ir[0, 1024] =~ /^\#define\s*\S*\s*(\d+)\s*\n\#define\s*\S*\s*(\d+)/mi
@@ -188,6 +252,7 @@ private
       if data.length != length
         raise FormatError, 'XPM size not found'
       end
+
       length += 1024
     end
     [$1.to_i, $2.to_i]
@@ -198,7 +263,7 @@ private
   end
 
   def size_of_tiff(ir)
-    endian2b = (ir[0, 4] == "II*\000") ? 'v' : 'n'
+    endian2b = ir[0, 4] == "II*\000" ? 'v' : 'n'
     endian4b = endian2b.upcase
     packspec = [nil, 'C', nil, endian2b, endian4b, nil, 'c', nil, endian2b, endian4b]
 
@@ -211,17 +276,18 @@ private
     until width && height
       ifd = ir[offset, 12]
       raise FormatError, 'Reached end of directory entries in TIFF' if ifd.nil? || offset > num_dirent
+
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
 
-      unless packspec[type].nil?
-        value = ifd[8, 4].unpack(packspec[type])[0]
-        case tag
-        when 0x0100
-          width = value
-        when 0x0101
-          height = value
-        end
+      next if packspec[type].nil?
+
+      value = ifd[8, 4].unpack(packspec[type])[0]
+      case tag
+      when 0x0100
+        width = value
+      when 0x0101
+        height = value
       end
     end
     [width, height]
@@ -236,12 +302,11 @@ private
     value_bit_length = ir[8, 1].unpack('B5').first.to_i(2)
     bit_length = 5 + value_bit_length * 4
     rect_bits = ir[8, bit_length / 8 + 1].unpack("B#{bit_length}").first
-    values = rect_bits.unpack('@5' + "a#{value_bit_length}" * 4).map{ |bits| bits.to_i(2) }
+    values = rect_bits[5..-1].unpack("a#{value_bit_length}" * 4).map{ |bits| bits.to_i(2) }
     x_min, x_max, y_min, y_max = values
     [(x_max - x_min) / 20, (y_max - y_min) / 20]
   end
 
-  DPI = 72
   def size_of_svg(ir)
     attributes = {}
     ir.data[SVG_R, 1].scan(/(\S+)=(?:'([^']*)'|"([^"]*)"|([^'"\s]*))/) do |name, v0, v1, v2|
@@ -249,18 +314,18 @@ private
     end
     dpi = self.class.dpi
     [attributes['width'], attributes['height']].map do |length|
-      if length
-        pixels = case length.downcase.strip[/(?:em|ex|px|in|cm|mm|pt|pc|%)\z/]
-        when 'em', 'ex', '%' then nil
-        when 'in' then length.to_f * dpi
-        when 'cm' then length.to_f * dpi / 2.54
-        when 'mm' then length.to_f * dpi / 25.4
-        when 'pt' then length.to_f * dpi / 72
-        when 'pc' then length.to_f * dpi / 6
-        else length.to_f
-        end
-        pixels.round if pixels
+      next unless length
+
+      pixels = case length.downcase.strip[/(?:em|ex|px|in|cm|mm|pt|pc|%)\z/]
+      when 'em', 'ex', '%' then nil
+      when 'in' then length.to_f * dpi
+      when 'cm' then length.to_f * dpi / 2.54
+      when 'mm' then length.to_f * dpi / 25.4
+      when 'pt' then length.to_f * dpi / 72
+      when 'pc' then length.to_f * dpi / 6
+      else length.to_f
       end
+      pixels.round if pixels
     end
   end
 
@@ -268,4 +333,57 @@ private
     ir[6, 2].unpack('CC').map{ |v| v.zero? ? 256 : v }
   end
   alias_method :size_of_cur, :size_of_ico
+
+  def size_of_webp(ir)
+    case ir[12, 4]
+    when 'VP8 '
+      ir[26, 4].unpack('vv').map{ |v| v & 0x3fff }
+    when 'VP8L'
+      n = ir[21, 4].unpack('V')[0]
+      [(n & 0x3fff) + 1, (n >> 14 & 0x3fff) + 1]
+    when 'VP8X'
+      w16, w8, h16, h8 = ir[24, 6].unpack('vCvC')
+      [(w16 | w8 << 16) + 1, (h16 | h8 << 16) + 1]
+    end
+  end
+
+  def size_of_jp2(ir)
+    offset = 12
+    stop = nil
+    in_header = false
+    loop do
+      break if stop && offset >= stop
+      break if ir[offset, 4] == '' || ir[offset, 4].nil?
+
+      size = ir[offset, 4].unpack('N')[0]
+      type = ir[offset + 4, 4]
+
+      data_offset = 8
+      case size
+      when 1
+        size = ir[offset, 8].unpack('Q>')[0]
+        data_offset = 16
+        raise FormatError, "Unexpected xl-box size #{size}" if (1..15).include?(size)
+      when 2..7
+        raise FormatError, "Reserved box size #{size}"
+      end
+
+      if type == 'jp2h'
+        stop = offset + size unless size.zero?
+        offset += data_offset
+        in_header = true
+      elsif in_header && type == 'ihdr'
+        return ir[offset + data_offset, 8].unpack('NN').reverse
+      else
+        break if size.zero? # box to the end of file
+
+        offset += size
+      end
+    end
+  end
+  alias_method :size_of_jpx, :size_of_jp2
+
+  def size_of_j2c(ir)
+    ir[8, 8].unpack('NN')
+  end
 end