diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-22 18:42:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-22 18:42:46 +0000 |
| commit | ef4cd174472dc1c4694d4451dc60b9292c60666b (patch) | |
| tree | 216d46bad240478d4dd9f289e0b542c2dc76dcbd /test | |
| parent | af474db6af17d468b42fbae8bd4c3e80dcfd0588 (diff) | |
Merge still/moving image classes.
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 2c239e767..9e8aa381b 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/still_image_content.h" +#include "lib/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<StillImageContent> contentA (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); contentA->set_ratio (Ratio::from_id ("185")); - shared_ptr<StillImageContent> contentB (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<ImageContent> contentB (new ImageContent (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 8d00be72a..c936fe8d4 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -18,7 +18,7 @@ */ #include <boost/test/unit_test.hpp> -#include "lib/still_image_content.h" +#include "lib/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<StillImageContent> imc (new StillImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (imc); |