From 3739c62f626b65da929d37fb7efc44a8e349e6f1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 23 May 2016 21:17:23 +0100
Subject: Attempt to make more concessions for Centos 5.

---
 src/lib/image_examiner.cc     | 2 +-
 src/lib/magick_image_proxy.cc | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index e0be15794..b9cd1caf5 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -43,7 +43,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
 	using namespace MagickCore;
 #endif
 	boost::filesystem::path path = content->path(0).string ();
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index cb168ce63..98054b8df 100644
--- 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);
-- 
cgit v1.2.3