diff options
| -rw-r--r-- | src/lib/image_examiner.cc | 2 | ||||
| -rw-r--r-- | src/lib/magick_image_proxy.cc | 5 | ||||
| -rw-r--r-- | wscript | 19 |
3 files changed, 23 insertions, 3 deletions
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); @@ -199,6 +199,25 @@ def configure(conf): if graphics is not None: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') + # See if we are using the MagickCore or MagickLib namespaces + conf.check_cxx(fragment=""" + #include <Magick++.h> + using namespace MagickCore; + """, + mandatory=False, + msg='Checking for MagickCore namespace', + okmsg='yes', + define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE') + + conf.check_cxx(fragment=""" + #include <Magick++.h> + using namespace MagickLib + """, + mandatory=False, + msg='Checking for MagickLib namespace', + okmsg='yes', + define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE') + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) |