Fixed GD thumbnailing of an image with an icc profile.

application/src/File/Thumbnailer/Gd.php

@@ -27,6 +27,11 @@ class Gd extends AbstractThumbnailer
  */
  protected $origHeight;
 
+ /**
+ * @var string The profile icc of the original image.
+ */
+ protected $icc;
+
  /**
  * Check whether the GD entension is loaded.
  *
@@ -56,6 +61,8 @@ public function setSource(TempFile $source)
  break;
  case 'image/jpeg':
  $origImage = imagecreatefromjpeg($sourcePath);
+ $inputPel = new \lsolesen\pel\PelJpeg($sourcePath);
+ $this->icc = $inputPel->getIcc();
  break;
  case 'image/png':
  $origImage = imagecreatefrompng($sourcePath);
@@ -71,6 +78,7 @@ public function setSource(TempFile $source)
  if (false === $origImage) {
  throw new Exception\CannotCreateThumbnailException;
  }
+
  $this->origImage = $origImage;
  $this->origWidth = imagesx($origImage);
  $this->origHeight = imagesy($origImage);
@@ -97,7 +105,15 @@ public function create($strategy, $constraint, array $options = [])
  }
 
  imagedestroy($tempImage);
- return $tempFile->getTempPath();
+
+ $tempPath = $tempFile->getTempPath();
+ if ($this->icc) {
+ $outputPel = new \lsolesen\pel\PelJpeg($tempPath);
+ $outputPel->setIcc($this->icc);
+ $outputPel->saveFile($tempPath);
+ }
+
+ return $tempPath;
  }
 
  /**

composer.json

@@ -64,7 +64,8 @@
  "zendframework/zendxml": "^1.0.2",
  "omeka/composer-addon-installer": "*",
  "omeka-s-themes/default": "dev-develop",
- "beberlei/doctrineextensions": "^1.0"
+ "beberlei/doctrineextensions": "^1.0",
+ "lsolesen/pel": "^0.9.6"
  },
  "require-dev": {
  "phpunit/phpunit": "^5.7.23 || ^6.4.4",