fastimage 2.3.0 → 2.4.0

data/lib/fastimage/fastimage_parsing/type_parser.rb

@@ -0,0 +1,69 @@
+module FastImageParsing
+  class TypeParser
+    def initialize(stream)
+      @stream = stream
+    end
+    
+    # type will use peek to get enough bytes to determing the type of the image
+    def type
+      parsed_type = case @stream.peek(2)
+      when "BM"
+        :bmp
+      when "GI"
+        :gif
+      when 0xff.chr + 0xd8.chr
+        :jpeg
+      when 0x89.chr + "P"
+        :png
+      when "II", "MM"
+        case @stream.peek(11)[8..10]
+        when "APC", "CR\002"
+          nil  # do not recognise CRW or CR2 as tiff
+        else
+          :tiff
+        end
+      when '8B'
+        :psd
+      when "\xFF\x0A".b
+        :jxl
+      when "\0\0"
+        case @stream.peek(3).bytes.to_a.last
+        when 0
+          # http://www.ftyps.com/what.html
+          case @stream.peek(12)[4..-1]
+          when "ftypavif"
+            :avif
+          when "ftypavis"
+            :avif
+          when "ftypheic"
+            :heic
+          when "ftypmif1"
+            :heif
+          else
+            if @stream.peek(7)[4..-1] == 'JXL'
+              :jxl
+            end
+          end
+        # ico has either a 1 (for ico format) or 2 (for cursor) at offset 3
+        when 1 then :ico
+        when 2 then :cur
+        end
+      when "RI"
+        :webp if @stream.peek(12)[8..11] == "WEBP"
+      when "<s"
+        :svg if @stream.peek(4) == "<svg"
+      when /\s\s|\s<|<[?!]/, 0xef.chr + 0xbb.chr
+        # Peek 10 more chars each time, and if end of file is reached just raise
+        # unknown. We assume the <svg tag cannot be within 10 chars of the end of
+        # the file, and is within the first 1000 chars.
+        begin
+          :svg if (1..100).detect {|n| @stream.peek(10 * n).include?("<svg")}
+        rescue FiberError, FastImage::CannotParseImage
+          nil
+        end
+      end
+
+      parsed_type or raise FastImage::UnknownImageType
+    end
+  end
+end

data/lib/fastimage/fastimage_parsing/webp.rb

@@ -0,0 +1,60 @@
+module FastImageParsing
+  class Webp < ImageBase # :nodoc:
+    def dimensions
+      vp8 = @stream.read(16)[12..15]
+      _len = @stream.read(4).unpack("V")
+      case vp8
+      when "VP8 "
+        parse_size_vp8
+      when "VP8L"
+        parse_size_vp8l
+      when "VP8X"
+        parse_size_vp8x
+      else
+        nil
+      end
+    end
+    
+    def animated?
+      vp8 = @stream.read(16)[12..15]
+      _len = @stream.read(4).unpack("V")
+      case vp8
+      when "VP8 "
+        false
+      when "VP8L"
+        false
+      when "VP8X"
+        flags = @stream.read(4).unpack("C")[0]
+        flags & 2 > 0
+      else
+        nil
+      end
+    end
+    
+    private
+  
+    def parse_size_vp8
+      w, h = @stream.read(10).unpack("@6vv")
+      [w & 0x3fff, h & 0x3fff]
+    end
+
+    def parse_size_vp8l
+      @stream.skip(1) # 0x2f
+      b1, b2, b3, b4 = @stream.read(4).bytes.to_a
+      [1 + (((b2 & 0x3f) << 8) | b1), 1 + (((b4 & 0xF) << 10) | (b3 << 2) | ((b2 & 0xC0) >> 6))]
+    end
+
+    def parse_size_vp8x
+      flags = @stream.read(4).unpack("C")[0]
+      b1, b2, b3, b4, b5, b6 = @stream.read(6).unpack("CCCCCC")
+      width, height = 1 + b1 + (b2 << 8) + (b3 << 16), 1 + b4 + (b5 << 8) + (b6 << 16)
+
+      if flags & 8 > 0 # exif
+        # parse exif for orientation
+        # TODO: find or create test images for this
+      end
+
+      [width, height]
+    end
+  end
+end

data/lib/fastimage/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class FastImage
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end