X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_proxy_test.cc;h=750b77561ad823fc8986831df8c75f56b6d417f5;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=a80a97f07273bdb522e74aa4e99aa7ec78babef6;hpb=4c58340a01c967d64f3d037130a31d791eff042e;p=dcpomatic.git diff --git a/test/image_proxy_test.cc b/test/image_proxy_test.cc index a80a97f07..750b77561 100644 --- a/test/image_proxy_test.cc +++ b/test/image_proxy_test.cc @@ -22,11 +22,10 @@ #include "lib/ffmpeg_image_proxy.h" #include "lib/j2k_image_proxy.h" #include "test.h" -#include #include -using boost::shared_ptr; +using std::shared_ptr; static const boost::filesystem::path data_file0 = TestPaths::private_data() / "player_seek_test_0.png"; @@ -54,14 +53,14 @@ BOOST_AUTO_TEST_CASE (j2k_image_proxy_same_test) BOOST_AUTO_TEST_CASE (ffmpeg_image_proxy_same_test) { { - shared_ptr proxy1(new FFmpegImageProxy(data_file0, VIDEO_RANGE_FULL)); - shared_ptr proxy2(new FFmpegImageProxy(data_file0, VIDEO_RANGE_FULL)); + shared_ptr proxy1(new FFmpegImageProxy(data_file0, VideoRange::FULL)); + shared_ptr proxy2(new FFmpegImageProxy(data_file0, VideoRange::FULL)); BOOST_CHECK (proxy1->same(proxy2)); } { - shared_ptr proxy1(new FFmpegImageProxy(data_file0, VIDEO_RANGE_FULL)); - shared_ptr proxy2(new FFmpegImageProxy(data_file1, VIDEO_RANGE_FULL)); + shared_ptr proxy1(new FFmpegImageProxy(data_file0, VideoRange::FULL)); + shared_ptr proxy2(new FFmpegImageProxy(data_file1, VideoRange::FULL)); BOOST_CHECK (!proxy1->same(proxy2)); } }