projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
test
/
image_test.cc
diff --git
a/test/image_test.cc
b/test/image_test.cc
index cb1aa35d7e7dd9c0f71628ed5c576970467e0b29..d002630356d6b402fe2fe1707e88f9c507594219 100644
(file)
--- a/
test/image_test.cc
+++ b/
test/image_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 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/>.
*/
*/
@@
-26,6
+27,7
@@
#include <boost/test/unit_test.hpp>
#include <Magick++.h>
#include "lib/image.h"
#include <boost/test/unit_test.hpp>
#include <Magick++.h>
#include "lib/image.h"
+#include <iostream>
using std::string;
using std::list;
using std::string;
using std::list;
@@
-34,8
+36,8
@@
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (aligned_image_test)
{
BOOST_AUTO_TEST_CASE (aligned_image_test)
{
- Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true);
- BOOST_CHECK_EQUAL (s->
component
s(), 1);
+ Image* s = new Image (
AV_
PIX_FMT_RGB24, dcp::Size (50, 50), true);
+ BOOST_CHECK_EQUAL (s->
plane
s(), 1);
/* 160 is 150 aligned to the nearest 32 bytes */
BOOST_CHECK_EQUAL (s->stride()[0], 160);
BOOST_CHECK_EQUAL (s->line_size()[0], 150);
/* 160 is 150 aligned to the nearest 32 bytes */
BOOST_CHECK_EQUAL (s->stride()[0], 160);
BOOST_CHECK_EQUAL (s->line_size()[0], 150);
@@
-46,7
+48,7
@@
BOOST_AUTO_TEST_CASE (aligned_image_test)
/* copy constructor */
Image* t = new Image (*s);
/* copy constructor */
Image* t = new Image (*s);
- BOOST_CHECK_EQUAL (t->
component
s(), 1);
+ BOOST_CHECK_EQUAL (t->
plane
s(), 1);
BOOST_CHECK_EQUAL (t->stride()[0], 160);
BOOST_CHECK_EQUAL (t->line_size()[0], 150);
BOOST_CHECK (t->data()[0]);
BOOST_CHECK_EQUAL (t->stride()[0], 160);
BOOST_CHECK_EQUAL (t->line_size()[0], 150);
BOOST_CHECK (t->data()[0]);
@@
-61,9
+63,9
@@
BOOST_AUTO_TEST_CASE (aligned_image_test)
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
- Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
+ Image* u = new Image (
AV_
PIX_FMT_YUV422P, dcp::Size (150, 150), false);
*u = *s;
*u = *s;
- BOOST_CHECK_EQUAL (u->
component
s(), 1);
+ BOOST_CHECK_EQUAL (u->
plane
s(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 160);
BOOST_CHECK_EQUAL (u->line_size()[0], 150);
BOOST_CHECK (u->data()[0]);
BOOST_CHECK_EQUAL (u->stride()[0], 160);
BOOST_CHECK_EQUAL (u->line_size()[0], 150);
BOOST_CHECK (u->data()[0]);
@@
-84,8
+86,8
@@
BOOST_AUTO_TEST_CASE (aligned_image_test)
BOOST_AUTO_TEST_CASE (compact_image_test)
{
BOOST_AUTO_TEST_CASE (compact_image_test)
{
- Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false);
- BOOST_CHECK_EQUAL (s->
component
s(), 1);
+ Image* s = new Image (
AV_
PIX_FMT_RGB24, dcp::Size (50, 50), false);
+ BOOST_CHECK_EQUAL (s->
plane
s(), 1);
BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
BOOST_CHECK (s->data()[0]);
BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
BOOST_CHECK (s->data()[0]);
@@
-95,7
+97,7
@@
BOOST_AUTO_TEST_CASE (compact_image_test)
/* copy constructor */
Image* t = new Image (*s);
/* copy constructor */
Image* t = new Image (*s);
- BOOST_CHECK_EQUAL (t->
component
s(), 1);
+ BOOST_CHECK_EQUAL (t->
plane
s(), 1);
BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3);
BOOST_CHECK (t->data()[0]);
BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3);
BOOST_CHECK (t->data()[0]);
@@
-110,9
+112,9
@@
BOOST_AUTO_TEST_CASE (compact_image_test)
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
/* assignment operator */
- Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
+ Image* u = new Image (
AV_
PIX_FMT_YUV422P, dcp::Size (150, 150), true);
*u = *s;
*u = *s;
- BOOST_CHECK_EQUAL (u->
component
s(), 1);
+ BOOST_CHECK_EQUAL (u->
plane
s(), 1);
BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3);
BOOST_CHECK (u->data()[0]);
BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3);
BOOST_CHECK (u->data()[0]);