image_size 1.3.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNlNjk3NjQ1N2ZjYzFiOTc5MjU5N2ZhY2JlNjI4M2ZlNTUwNTA0Mg==
+    MTU4YzA0NzUyYWUyZWYzMDgzY2JhYTk1NmMyZGM0NzY4YTcyZjZkYw==
   data.tar.gz: !binary |-
-    ODQ2MTBiYTg4ZjA1ZTZjZDVjM2ZiNzc1NWQ5ODYxZTgyNmUwNjM4OQ==
+    NmY0ZmEzNjg1MjdmNTg1ZGZjNTYwOTExNzAzMTJhNzNiNDdlZWU4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDA3NTQ4YzdkMTRjZmRiNGIxZTdkN2QxNTI5N2I3YzBkZWI5NjU3ODQ3ZmQz
-    Y2M4NDkxMTgxODQ1MGI4MzhlZWI0NjE0MmY2NTQyN2ZkNjgzMzUxNTIwYTYw
-    YWU1MThhYWYzZmUzMTMxZGMxOTFmY2FmMTQzNmQ0YTI3MzRmZjU=
+    NjM1NjgxYzhiMTYwMTk4YWQ2NzUwZjVkZTE3NDFkN2I4NzZiM2RiYWQ3MjBi
+    OTExZjM1MTI0YmJiMzU3YTNkNWVhZmQ0M2ExMDE1ZGM4M2JkMTRkZTc3YTkw
+    ZWNmMWYxMWM4YWFjMGM4YTY0NjMyYTAwYTliMTc5ODIwMzZiOGU=
   data.tar.gz: !binary |-
-    MGViZWJmNTY3ZTA1ZWJkNjcyMjE5YjQ0ZTViMTkxNzA4NmY3ZmU2MjkyNzJj
-    MjM0YzUyNjkyODRhZWY1YmY1MTBjOWVmZWZmNDgzMGZlMjg4OTg0ZDY0NTUx
-    ZDM3MzZkMWFjMTE1N2YwMGFjMWNmNDY0ZGRjYWJiMDg2NDFkZTY=
+    ZDE5NjZlNDc4OWYwOTYyYzM0YjQ4NTlhYzZjYzBkZmI5MjVjODZmYmUxZGU2
+    M2ZkNzk3YzI2Mjc4YzYwYmU1ODg5ZjIzYTAyZmYyNzk0YzFhMGRiYzlmYjZm
+    OGZiNDk4MDI4MGRkMzk3ZmEyZGU1NzY0ZWVlZjRkYzU4YTU2OTQ=

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.3.0'
+  s.version     = '1.3.1'
   s.summary     = %q{Measure image size using pure Ruby}
   s.description = %q{Measure following file dimensions: bmp, gif, jpeg, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm}
   s.homepage    = "http://github.com/toy/#{s.name}"

data/lib/image_size.rb

@@ -135,9 +135,12 @@ private
     section_marker = "\xFF"
     offset = 2
     loop do
+      offset += 1 until [nil, section_marker].include? ir[offset, 1]
+      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')
       offset += 4
-      raise FormatError, 'JPEG marker not found' if marker != section_marker
 
       if JpegCodeCheck.include?(code)
         return ir[offset + 1, 4].unpack('nn').reverse

data/spec/image_size_spec.rb

@@ -9,6 +9,7 @@ describe ImageSize do
     ['test3t.bmp',:bmp,  42,  50],
     ['test.gif',  :gif, 668, 481],
     ['test.jpg', :jpeg, 320, 240],
+    ['test2.jpg',:jpeg, 320, 240],
     ['test.pbm',  :pbm,  85,  55],
     ['test.pcx',  :pcx,  70,  60],
     ['test.pgm',  :pgm,  90,  55],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,7 @@ files:
 - spec/test.xbm
 - spec/test.xpm
 - spec/test2.bmp
+- spec/test2.jpg
 - spec/test3b.bmp
 - spec/test3t.bmp
 homepage: http://github.com/toy/image_size
@@ -93,5 +94,6 @@ test_files:
 - spec/test.xbm
 - spec/test.xpm
 - spec/test2.bmp
+- spec/test2.jpg
 - spec/test3b.bmp
 - spec/test3t.bmp