dynamic_image 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb9c218b8902487079281c04685088ba37cee03ba5944425c8e391869ed1f54
-  data.tar.gz: 6be8904c347f0721fe0d52f4693c65c7a7c96d77d81b169c00b83859df46c741
+  metadata.gz: 2a9eeb1b5378e17d2dcf9d6c0245df5386a1253dfdbefd0fff61fd5faeb2a1ee
+  data.tar.gz: 3156acfe1931d9530dc5c23d51716904feb2f1f16f00657cd9aa52c61d97cf94
 SHA512:
-  metadata.gz: 712f4d5d9077baec9e3f67d01ae686a38ef380686a37a5c6c91b2e0d27db50e2623cd30c3b25e107a3b03fc6e0712fe20bc0643fc47ae73473ee735e94d031b5
-  data.tar.gz: 8ef5cd0021f2d32bc0876923c19f9e059edd5fdb52e06893cbab4dc4d739f72551f5bf53da8ee0007854f78d2cb5cc1de157542e40be9d27b17c6eeee735ccdb
+  metadata.gz: d3c0d2fd1e238b181b8d7cd86ebb12c65ebbe37e606bf434c969584def13b968e0bbd66b845b553d65c7d8e9245f20a066b88ee66f523de87391adf285aa194a
+  data.tar.gz: 51eda1715d2eb18931256018f95dfe9f714817bda16601d5c1ded50778cc4a0a31d27ec00ffe3287a88205e1c49cea09c0d159594c8552a2a94084821ff403c1

data/lib/dynamic_image/processed_image.rb

@@ -43,7 +43,7 @@ module DynamicImage
     # Normalizes the image.
     #
     # * Applies EXIF rotation
-    # * CMYK images are converted to sRGB
+    # * Converts to sRGB
     # * Strips metadata
     # * Optimizes GIFs
     # * Performs format conversion if the requested format is different
@@ -59,7 +59,7 @@ module DynamicImage
       process_data do |image|
         image.combine_options do |combined|
           combined.auto_orient
-          combined.colorspace("sRGB") if needs_colorspace_conversion?
+          convert_to_srgb(image, combined)
           yield(combined) if block_given?
           optimize(combined)
         end
@@ -73,6 +73,11 @@ module DynamicImage
       gif? ? DynamicImage::ImageReader.new(image.coalesce.to_blob).read : image
     end
 
+    def convert_to_srgb(image, combined)
+      combined.profile(srgb_profile) if image.data["profiles"].present?
+      combined.colorspace("sRGB") if record.cmyk?
+    end
+
     def create_variant(size)
       record.variants.create(
         variant_params(size).merge(filename: record.filename,
@@ -113,10 +118,6 @@ module DynamicImage
         DynamicImage::ImageSizing.new(record, uncropped: @uncropped)
     end
 
-    def needs_colorspace_conversion?
-      record.cmyk?
-    end
-
     def needs_format_conversion?
       format != record_format
     end
@@ -139,12 +140,8 @@ module DynamicImage
     attr_reader :record
 
     def record_format
-      { "image/bmp" => "BMP",
-        "image/png" => "PNG",
-        "image/gif" => "GIF",
-        "image/jpeg" => "JPEG",
-        "image/pjpeg" => "JPEG",
-        "image/tiff" => "TIFF",
+      { "image/bmp" => "BMP", "image/png" => "PNG", "image/gif" => "GIF",
+        "image/jpeg" => "JPEG", "image/pjpeg" => "JPEG", "image/tiff" => "TIFF",
         "image/webp" => "WEBP" }[record.content_type]
     end
 
@@ -152,6 +149,10 @@ module DynamicImage
       raise DynamicImage::Errors::InvalidImage unless record.valid?
     end
 
+    def srgb_profile
+      File.join(File.dirname(__FILE__), "profiles/sRGB_ICC_v4_Appearance.icc")
+    end
+
     def variant_params(size)
       crop_size, crop_start = image_sizing.crop_geometry(size)
 

data/lib/dynamic_image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -162,6 +162,7 @@ files:
 - lib/dynamic_image/model/validations.rb
 - lib/dynamic_image/model/variants.rb
 - lib/dynamic_image/processed_image.rb
+- lib/dynamic_image/profiles/sRGB_ICC_v4_Appearance.icc
 - lib/dynamic_image/routing.rb
 - lib/dynamic_image/templates/show.html.erb
 - lib/dynamic_image/version.rb