Add Imagick CMYK to SRGB conversion

Author: Timon de Groot

lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php

@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Image\Adapter;
 
 use Magento\Framework\Exception\LocalizedException;
 
 /**
- * Image adapter from ImageMagick
+ * Image adapter from ImageMagick.
+ *
+ * @property \Imagick $_imageHandler
  */
 class ImageMagick extends AbstractAdapter
 {
@@ -35,6 +38,19 @@ class ImageMagick extends AbstractAdapter
         'sharpen' => ['radius' => 4, 'deviation' => 1],
     ];
 
+    /**
+     * Colorspace of the image
+     *
+     * @var int
+     */
+    protected $colorspace = -1;
+    /**
+     * Original colorspace of the image
+     *
+     * @var int
+     */
+    protected $originalColorspace = -1;
+
     /**
      * Set/get background color. Check Imagick::COLOR_* constants
      *
@@ -89,6 +105,8 @@ public function open($filename)
             );
         }
 
+        $this->getColorspace();
+        $this->maybeConvertColorspace();
         $this->backgroundColor();
         $this->getMimeType();
     }
@@ -136,8 +154,8 @@ protected function _applyOptions()
     /**
      * Render image and return its binary contents
      *
-     * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
+     * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      */
     public function getImage()
     {
@@ -265,7 +283,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         $this->_checkCanProcess();
 
         $opacity = $this->getWatermarkImageOpacity() ? $this->getWatermarkImageOpacity() : $opacity;
-        $opacity = (double)number_format($opacity / 100, 1);
+        $opacity = (double) number_format($opacity / 100, 1);
 
         $watermark = new \Imagick($imagePath);
 
@@ -395,8 +413,8 @@ public function getColorAt($x, $y)
     /**
      * Check whether the adapter can work with the image
      *
-     * @throws \LogicException
      * @return true
+     * @throws \LogicException
      */
     protected function _checkCanProcess()
     {
@@ -562,4 +580,42 @@ private function addSingleWatermark($positionX, int $positionY, \Imagick $waterm
             $compositeChannels
         );
     }
+
+    /**
+     * Get and store the image colorspace.
+     *
+     * @return int
+     */
+    public function getColorspace(): int
+    {
+        if ($this->colorspace === -1) {
+            $this->originalColorspace = $this->colorspace = $this->_imageHandler->getImageColorspace();
+        }
+
+        return $this->colorspace;
+    }
+
+    /**
+     * Get the original image colorspace.
+     *
+     * @return int
+     */
+    public function getOriginalColorspace(): int
+    {
+        return $this->originalColorspace;
+    }
+
+    /**
+     * Convert colorspace to SRGB if current colorspace
+     * is COLORSPACE_CMYK or COLORSPACE_UNDEFINED.
+     *
+     * @return void
+     */
+    private function maybeConvertColorspace(): void
+    {
+        if ($this->colorspace === \Imagick::COLORSPACE_CMYK || $this->colorspace === \Imagick::COLORSPACE_UNDEFINED) {
+            $this->_imageHandler->transformImageColorspace(\Imagick::COLORSPACE_SRGB);
+            $this->colorspace = \Imagick::COLORSPACE_SRGB;
+        }
+    }
 }

lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php

@@ -73,10 +73,7 @@ public function testWatermark($imagePath, $expectedMessage)
         $this->imageMagic->watermark($imagePath);
     }
 
-    /**
-     * @return array
-     */
-    public function watermarkDataProvider()
+    public function watermarkDataProvider(): array
     {
         return [
             ['', ImageMagick::ERROR_WATERMARK_IMAGE_ABSENT],
@@ -88,6 +85,44 @@ public function watermarkDataProvider()
         ];
     }
 
+    /**
+     * @param string $imagePath
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @dataProvider cmykDataProvider
+     */
+    public function testCmyk(string $imagePath)
+    {
+        $this->imageMagic->open($imagePath);
+        $this->assertEquals(\Imagick::COLORSPACE_CMYK, $this->imageMagic->getOriginalColorspace());
+        $this->assertEquals(\Imagick::COLORSPACE_SRGB, $this->imageMagic->getColorspace());
+    }
+
+    public function cmykDataProvider(): array
+    {
+        return [
+            [__DIR__ . '/_files/cmyk_image.jpg']
+        ];
+    }
+
+    /**
+     * @param string $imagePath
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @dataProvider srgbDataProvider
+     */
+    public function testSrgb(string $imagePath)
+    {
+        $this->imageMagic->open($imagePath);
+        $this->assertEquals(\Imagick::COLORSPACE_SRGB, $this->imageMagic->getOriginalColorspace());
+        $this->assertEquals(\Imagick::COLORSPACE_SRGB, $this->imageMagic->getColorspace());
+    }
+
+    public function srgbDataProvider(): array
+    {
+        return [
+            [__DIR__ . '/_files/srgb_image.jpg']
+        ];
+    }
+
     public function testSaveWithException()
     {
         $this->expectException('Exception');