fastimage 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074e776db55bfd4766292bca262afc562d4d38d07d86f56f1299a666b4dc3e30
-  data.tar.gz: 7e079013cbd7802773119a5a6b7f25377e2878c1afbeb610c68d8a8a069ad0a1
+  metadata.gz: cfa3d72608b0c236038f0d4917930580df5474e5b46b61bcbb5758190e0050e3
+  data.tar.gz: 759948e3de376e61a038c6a710b1d15a39d0459c2c20efa7fefbf3692bcc26b7
 SHA512:
-  metadata.gz: 4c82693c20723bc22b41e9839104097b0cb435c392e8ddd19edff93aeaa1802f3319c6ad49f1b82ba3926bd1bdcc5e04870d02401ff20e745e61d26a81473c6b
-  data.tar.gz: 230fbfd667aab5c59ce7bc53909454d2d9134fdb3c6705173d5df264a3c8a36df2d879c959df1ab4662d5e216a554ada7ba482ba3e0872b9c000d087c91e5b29
+  metadata.gz: 49a8af8f7dbed9c9c2de250a67cd9ff2810c7b0a5a41d79c5069b777331573de9633163cbc3a95b7a5710e695065a6266e37a255cfeb3ed380ddd29076ce34d9
+  data.tar.gz: 4c9136b413828a5ef790befb5b16144fdc277979c5e28b855886888ea513aa7343900269c302feb495639cd5647f0e58dcdb1a67dd812f4d1357c42adaf1ebe5

data/lib/fastimage.rb

@@ -61,6 +61,7 @@ require 'pathname'
 require 'zlib'
 require 'base64'
 require 'uri'
+require_relative 'fastimage/version'
 
 # see http://stackoverflow.com/questions/5208851/i/41048816#41048816
 if RUBY_VERSION < "2.2"
@@ -589,6 +590,7 @@ class FastImage
     end
 
     def width_and_height
+      @rotation = 0
       @max_size = nil
       @primary_box = nil
       @ipma_boxes = []
@@ -599,11 +601,19 @@ class FastImage
         read_boxes!
       end
 
-      @final_size
+      if [90, 270].include?(@rotation)
+        @final_size.reverse
+      else
+        @final_size
+      end
     end
 
     private
 
+    # Format specs: https://www.loc.gov/preservation/digital/formats/fdd/fdd000525.shtml
+
+    # If you need to inspect a heic/heif file, use
+    # https://gpac.github.io/mp4box.js/test/filereader.html
     def read_boxes!(max_read_bytes = nil)
       end_pos = max_read_bytes.nil? ? nil : @stream.pos + max_read_bytes
       index = 0
@@ -624,6 +634,8 @@ class FastImage
           handle_hdlr_box(box_size)
         when "iprp", "ipco"
           read_boxes!(box_size)
+        when "irot"
+          handle_irot_box
         when "ispe"
           handle_ispe_box(box_size, index)
         when "mdat"
@@ -636,6 +648,10 @@ class FastImage
       end
     end
 
+    def handle_irot_box
+      @rotation = (read_uint8! & 0x3) * 90
+    end
+
     def handle_ispe_box(box_size, index)
       throw :finish if box_size < 12
 

data/lib/fastimage/version.rb

@@ -0,0 +1,3 @@
+class FastImage
+  VERSION = "2.2.5"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Stephen Sykes
@@ -77,6 +77,7 @@ files:
 - MIT-LICENSE
 - README.textile
 - lib/fastimage.rb
+- lib/fastimage/version.rb
 homepage: http://github.com/sdsykes/fastimage
 licenses:
 - MIT