projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy new year.
[dcpomatic.git]
/
test
/
make_black_test.cc
diff --git
a/test/make_black_test.cc
b/test/make_black_test.cc
index f6c3a4bb2bbc87616ffc3cfbeb84a3ffacc07704..2ed5db8eff55c91286e7045fde006460328bae39 100644
(file)
--- a/
test/make_black_test.cc
+++ b/
test/make_black_test.cc
@@
-1,26
+1,27
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file test/make_black_test.cc
*/
/** @file test/make_black_test.cc
- * @brief Check that Image::make_black works
,
and doesn't use values which crash
+ * @brief Check that Image::make_black works and doesn't use values which crash
* sws_scale().
* sws_scale().
- *
+ *
@ingroup selfcontained
* @see test/image_test.cc
*/
* @see test/image_test.cc
*/
@@
-30,7
+31,6
@@
extern "C" {
#include <libavutil/pixfmt.h>
}
#include "lib/image.h"
#include <libavutil/pixfmt.h>
}
#include "lib/image.h"
-#include "lib/scaler.h"
using std::list;
using std::list;
@@
-76,13
+76,13
@@
BOOST_AUTO_TEST_CASE (make_black_test)
pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE);
pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE);
pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46
pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE);
pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE);
pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46
-
+
int N = 0;
for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
foo->make_black ();
int N = 0;
for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
foo->make_black ();
- boost::shared_ptr<Image> bar = foo->scale (out_size,
Scaler::from_id ("bicubic"), PIX_FMT_RGB24, tru
e);
-
+ boost::shared_ptr<Image> bar = foo->scale (out_size,
dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, fals
e);
+
uint8_t* p = bar->data()[0];
for (int y = 0; y < bar->size().height; ++y) {
uint8_t* q = p;
uint8_t* p = bar->data()[0];
for (int y = 0; y < bar->size().height; ++y) {
uint8_t* q = p;