Skip to content

Commit

Permalink
Merge pull request #181 from DiegoPino/7.x-ISLANDORA-2154
Browse files Browse the repository at this point in the history
ISLANDORA-2154: Don't fail on TN generation if Source OBJ throws warnings
  • Loading branch information
Daniel Aitken authored Feb 21, 2018
2 parents 23e7786 + e60781f commit 6654014
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion includes/derivatives.inc
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ function islandora_large_image_get_colorspace($file) {

$escaped_file = escapeshellarg(drupal_realpath($file));

$colorspace = exec(escapeshellcmd("$identify -format %[colorspace] -regard-warnings ") . $escaped_file, $output, $procret);
$colorspace = exec(escapeshellcmd("$identify -quiet -format %[colorspace] ") . $escaped_file, $output, $procret);

return !$procret ? $colorspace : FALSE;
}
Expand Down

0 comments on commit 6654014

Please sign in to comment.