fastimage 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9d75d5620c240241218d8a9dc5219882bdaf56
-  data.tar.gz: 6df2e5e2117e2e7595dc2492e904e76109762c67
+  metadata.gz: c63f6d99fe0d72ebc82cc5e9f6af7de6d6fef324
+  data.tar.gz: 572d3036b3af69025a484a9b446c6d6821d5979e
 SHA512:
-  metadata.gz: 91d8c6996afb13c592796d913ddf35f015e1191bdca7d1402b63df88f54ede5fd72b9409fe14fb44ce7911f0a075bb74a453a9a4d84c95bfe6b3249c28714f27
-  data.tar.gz: ab50ea1309e9f60c1c8ca2d65e75634cd3b64a3f0ccffe637394513083d9faa51ca7e2145924ebe4defb4b06f0dcc4f306f69fde4db9612dad61a3f97c650d8d
+  metadata.gz: e81707dfb27fd2fe650f497fcf0f9143a37cd15ad824471c897819167fe2b7c0f0ac21cddef4caec899b096a7e052734d0e0eca4a03e49e44fa715092c6cee34
+  data.tar.gz: b7b3d2d371f15adc282d538ffa61ed199256fe45dcd90764fac603f0cbe3c3de45d69a066d7eff5608e62b8bd233e38fbefd5a96adbd63ec77429a3130bff042

data/lib/fastimage.rb

@@ -413,8 +413,17 @@ class FastImage
   end
 
   def parse_size_for_bmp
-    d = get_chars(29)[14..28]
-    d.unpack("C")[0] == 40 ? d[4..-1].unpack('LL') : d[4..8].unpack('SS')
+    d = get_chars(32)[14..28]
+    header = d.unpack("C")[0]
+    
+    result = if header == 40
+               d[4..-1].unpack('l<l<')
+             else
+               d[4..8].unpack('SS')
+             end
+
+    # ImageHeight is expressed in pixels. The absolute value is necessary because ImageHeight can be negative
+    [result.first, result.last.abs]
   end
 
   def get_exif_byte_order

data/test/test.rb

@@ -12,6 +12,7 @@ FixturePath = File.join(PathHere, "fixtures")
 
 GoodFixtures = {
   "test.bmp"=>[:bmp, [40, 27]],
+  "test2.bmp"=>[:bmp, [1920, 1080]],
   "test.gif"=>[:gif, [17, 32]],
   "test.jpg"=>[:jpeg, [882, 470]],
   "test.png"=>[:png, [30, 20]],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -44,6 +44,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FastImage finds the size or type of an image given its uri by fetching
   as little as needed.
 email: sdsykes@gmail.com
@@ -91,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: FastImage - Image info fast