projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More OS X fixes.
[dcpomatic.git]
/
test
/
scaling_test.cc
diff --git
a/test/scaling_test.cc
b/test/scaling_test.cc
index cdf1653cdf84a7c78b40f1518a3d81516a600063..b6b38e1260e58ec4f98385a1f2f788c623eb842b 100644
(file)
--- a/
test/scaling_test.cc
+++ b/
test/scaling_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,6
+17,10
@@
*/
*/
+/** @file test/scaling_test.cc
+ * @brief Test scaling and black-padding of images from a still-image source.
+ */
+
#include <boost/test/unit_test.hpp>
#include "lib/image_content.h"
#include "lib/ratio.h"
#include <boost/test/unit_test.hpp>
#include "lib/image_content.h"
#include "lib/ratio.h"
@@
-24,10
+28,6
@@
#include "lib/dcp_content_type.h"
#include "test.h"
#include "lib/dcp_content_type.h"
#include "test.h"
-/** @file test/scaling_test.cc
- * @brief Test scaling and black-padding of images from a still-image source.
- */
-
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
@@
-63,15
+63,21
@@
BOOST_AUTO_TEST_CASE (scaling_test)
film->examine_and_add_content (imc);
wait_for_jobs ();
film->examine_and_add_content (imc);
wait_for_jobs ();
-
+
imc->set_video_length (1);
imc->set_video_length (1);
+ /* F-133: 133 image in a flat container */
scaling_test_for (film, imc, "133", "185");
scaling_test_for (film, imc, "133", "185");
+ /* F: flat image in a flat container */
scaling_test_for (film, imc, "185", "185");
scaling_test_for (film, imc, "185", "185");
+ /* F-S: scope image in a flat container */
scaling_test_for (film, imc, "239", "185");
scaling_test_for (film, imc, "239", "185");
+ /* S-133: 133 image in a scope container */
scaling_test_for (film, imc, "133", "239");
scaling_test_for (film, imc, "133", "239");
+ /* S-F: flat image in a scope container */
scaling_test_for (film, imc, "185", "239");
scaling_test_for (film, imc, "185", "239");
+ /* S: scope image in a scope container */
scaling_test_for (film, imc, "239", "239");
}
scaling_test_for (film, imc, "239", "239");
}