dynamic_image 2.0.25 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b1cfa9c326762d6b3d1bca63b4d8d65516cc266abd03f55328b4cca8086dc3
-  data.tar.gz: 4a0496d6507534664dc8e39bc59358a2607df6aaaa966ee0eda3990f72cae8bf
+  metadata.gz: fd1d723cd97a91199630354e541d2a740aa41bae8ccb07554c1e723096a1b6dc
+  data.tar.gz: b4f5a8bf26b69da95543cb8885f5add2b72504ea88f83c4097bc1c25a13c622f
 SHA512:
-  metadata.gz: c04933c776c41870142473869f983fd0d8d1a0b98602abf41b3fb5392f6d6ef8c4cb2f77c875044f32cbc7903d1dd9de06c644fcfc73c913bd414583ee27dfae
-  data.tar.gz: 79ad9d9b59398d56765878253170eae968d2d8320c31b992fd9758ff2dd00b8131db1fae2746f6af359eeb8b9934dfe4020b30cd91602f1b6872302c95b2d1d6
+  metadata.gz: e2ba7e0be3c929f9da2b1c7311ae7a246341f081cc8057e8293417a8a73634ec5844d0ce7a691c3d5c771d99924b311c59a2a9b9bf2e2baae84675a3967a8614
+  data.tar.gz: '08cfc8124f2d6e2bd9d505315b1af7ed87e42ae4ff497a88fafd240e9594943721a6f72e7f196d5dffb1a43a1c8489e9b1b427e4042e149aedcf21a22f0506ba'

data/README.md

@@ -31,6 +31,7 @@ and enumeration attacks.
 * Rails 5
 * Ruby 2.4+
 * ImageMagick command line tools
+* ExifTool
 
 ## Documentation
 

data/lib/dynamic_image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "mini_exiftool"
 require "mini_magick"
 require "dis"
 require "vector2d"

data/lib/dynamic_image/image_reader.rb

@@ -21,6 +21,12 @@ module DynamicImage
       @data = data
     end
 
+    def exif
+      raise DynamicImage::Errors::InvalidHeader unless valid_header?
+
+      MiniExiftool.new(string_io)
+    end
+
     def read
       raise DynamicImage::Errors::InvalidHeader unless valid_header?
 
@@ -39,7 +45,11 @@ module DynamicImage
     private
 
     def file_header
-      @file_header ||= StringIO.new(@data, "rb").read(8)
+      @file_header ||= string_io.read(8)
+    end
+
+    def string_io
+      StringIO.new(@data, "rb")
     end
   end
 end

data/lib/dynamic_image/processed_image.rb

@@ -90,7 +90,10 @@ module DynamicImage
     end
 
     def convert_to_srgb(image, combined)
-      combined.profile(srgb_profile) if image.data["profiles"].present?
+      if image.data["profiles"].present? &&
+         exif.colorspacedata&.strip&.downcase == record.colorspace
+        combined.profile(srgb_profile)
+      end
       combined.colorspace("sRGB") if record.cmyk?
     end
 
@@ -111,6 +114,10 @@ module DynamicImage
       end
     end
 
+    def exif
+      @exif ||= DynamicImage::ImageReader.new(record.data).exif
+    end
+
     def format
       @format ||= record_format
     end

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "2.0.25"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.1.0
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: mini_exiftool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement