projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index 5e8dab3085171b49389476ab749ec97c1f2e3d82..cdf1653cdf84a7c78b40f1518a3d81516a600063 100644
(file)
--- a/
test/scaling_test.cc
+++ b/
test/scaling_test.cc
@@
-18,7
+18,7
@@
*/
#include <boost/test/unit_test.hpp>
*/
#include <boost/test/unit_test.hpp>
-#include "lib/image
magick
_content.h"
+#include "lib/image_content.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
@@
-33,7
+33,7
@@
using boost::shared_ptr;
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
{
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
{
- content->set_
ratio (Ratio::from_id (image
));
+ content->set_
scale (VideoContentScale (Ratio::from_id (image)
));
film->set_container (Ratio::from_id (container));
film->make_dcp ();
film->set_container (Ratio::from_id (container));
film->make_dcp ();
@@
-56,9
+56,9
@@
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
BOOST_AUTO_TEST_CASE (scaling_test)
{
shared_ptr<Film> film = new_test_film ("scaling_test");
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_dcp_content_type (DCPContentType::from_
isdcf
_name ("FTR"));
film->set_name ("scaling_test");
film->set_name ("scaling_test");
- shared_ptr<Image
MagickContent> imc (new ImageMagick
Content (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<Image
Content> imc (new Image
Content (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (imc);
film->examine_and_add_content (imc);