Use dcp::compose rather than our own.
[dcpomatic.git] / test / image_test.cc
index 3993b3efbdeaf7f99e4cff9f4b1f04caf4d7c4dd..c461a93d3c204bffbd3029a91ea834318cd5ff52 100644 (file)
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/image.h"
 #include "lib/image_content.h"
 #include "lib/image_decoder.h"
 #include "lib/ffmpeg_image_proxy.h"
 #include "test.h"
+#include <dcp/compose.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -364,7 +364,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7)
                        true,
                        false
                        );
-               path file = String::compose("crop_scale_window_test7-%1.png", left_crop);
+               path file = dcp::compose("crop_scale_window_test7-%1.png", left_crop);
                write_image(cropped, path("build") / "test" / file);
                check_image(path("test") / "data" / file, path("build") / "test" / file, 10);
        }