diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-19 16:08:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-19 16:08:29 +0100 |
| commit | bd453939da140ea994282e1c167ea5f8d02e2d94 (patch) | |
| tree | 8cdfbacdc9f33f82ab13895a0ed5207fd0bc8fa1 /test | |
| parent | 56506a1993f402fe889a650faa3de2e265632498 (diff) | |
Spacing tweaks; rename ImageMagick -> StillImage.
Diffstat (limited to 'test')
| -rw-r--r-- | test/black_fill_test.cc | 6 | ||||
| -rw-r--r-- | test/scaling_test.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 48cf1f53c..4bd76c07f 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -18,7 +18,7 @@ */ #include <boost/test/unit_test.hpp> -#include "lib/imagemagick_content.h" +#include "lib/still_image_content.h" #include "lib/dcp_content_type.h" #include "lib/film.h" #include "lib/ratio.h" @@ -37,9 +37,9 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->set_name ("black_fill_test"); film->set_container (Ratio::from_id ("185")); film->set_sequence_video (false); - shared_ptr<ImageMagickContent> contentA (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<StillImageContent> contentA (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); contentA->set_ratio (Ratio::from_id ("185")); - shared_ptr<ImageMagickContent> contentB (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<StillImageContent> contentB (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); contentB->set_ratio (Ratio::from_id ("185")); film->examine_and_add_content (contentA); diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 5e8dab308..8d00be72a 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -18,7 +18,7 @@ */ #include <boost/test/unit_test.hpp> -#include "lib/imagemagick_content.h" +#include "lib/still_image_content.h" #include "lib/ratio.h" #include "lib/film.h" #include "lib/dcp_content_type.h" @@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (scaling_test) shared_ptr<Film> film = new_test_film ("scaling_test"); film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); film->set_name ("scaling_test"); - shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<StillImageContent> imc (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc); |