From: Carl Hetherington Date: Tue, 11 Jul 2017 09:29:14 +0000 (+0100) Subject: Try to fix build with GraphicsMagick. X-Git-Tag: v2.11.12~1 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=b242f871b4da75572bb0d5bf111ae6103bf669b7;p=dcpomatic.git Try to fix build with GraphicsMagick. --- diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc index e6a93d899..4cefd9018 100644 --- a/src/lib/magick_image_proxy.cc +++ b/src/lib/magick_image_proxy.cc @@ -102,9 +102,17 @@ MagickImageProxy::image (optional, optional) const throw DecodeError (String::compose (_("Could not decode image file (%1)"), error)); } +#ifdef DCPOMATIC_IMAGE_MAGICK if (magick_image->colorSpace() == Magick::LogColorspace) { magick_image->colorSpace(Magick::RGBColorspace); } +#endif +#ifdef DCPOMATIC_GRAPHICS_MAGICK + if (magick_image->colorSpace() == Magick::CineonLogRGBColorspace) { + magick_image->colorSpace(Magick::RGBColorspace); + } + +#endif dcp::Size size (magick_image->columns(), magick_image->rows());