Remove log from ImageProxy hierarchy.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 0211c2cb8ae9d8e88c60a677b4b471f702daad06..f31103b9b7d59a60334b94f548cfafe998275a03 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -72,6 +72,7 @@ struct TestConfig
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
+               Config::instance()->set_default_j2k_bandwidth (100000000);
 
                ServerFinder::instance()->disable ();
 
@@ -308,7 +309,11 @@ wait_for_jobs ()
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 {
-       using namespace MagickCore;
+#ifdef DCPOMATIC_IMAGE_MAGICK
+               using namespace MagickCore;
+#else
+               using namespace MagickLib;
+#endif         
 
        Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
        m.write (file.string ());