From 734340b52d30cb2dde9aa9e81c77277b261b128e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 22:18:15 +0100 Subject: Fix build on Debian unstable which now has GraphicsMagick rather than ImageMagick. --- src/lib/image_proxy.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib/image_proxy.cc') diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 3aba6cf7c..3851f88e7 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -156,7 +156,11 @@ MagickImageProxy::image () const /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */ uint8_t* p = _image->data()[0]; for (int i = 0; i < size.height; ++i) { +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#else + using namespace MagickLib; +#endif magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); p += _image->stride()[0]; } -- cgit v1.2.3