Attempt to make more concessions for Centos 5.

[dcpomatic.git] / src / lib / magick_image_proxy.cc

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index cb168ce63a7797e6cf17aa8f8c42ca3cd81c2eca..98054b8dfed5ebf43fb2ee03231c30070808f2b8 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -108,9 +108,10 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) 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
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
                using namespace MagickCore;
-#else
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
                using namespace MagickLib;
 #endif
                magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);