projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
490af88
)
Try to fix build with GraphicsMagick.
author
Carl Hetherington
<cth@carlh.net>
Tue, 11 Jul 2017 09:29:14 +0000
(10:29 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 11 Jul 2017 09:29:14 +0000
(10:29 +0100)
src/lib/magick_image_proxy.cc
patch
|
blob
|
history
diff --git
a/src/lib/magick_image_proxy.cc
b/src/lib/magick_image_proxy.cc
index e6a93d899ce5fa64a920d8b39d957d2bb474b15e..4cefd9018ea6238d03fb7b5c5e5841ee72b90f33 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-102,9
+102,17
@@
MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
throw DecodeError (String::compose (_("Could not decode image file (%1)"), error));
}
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);
}
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());
dcp::Size size (magick_image->columns(), magick_image->rows());