X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fpixel_formats_test.cc;h=46e7193e21dd4007a68b0a593fe274f945d4f01d;hp=68d225e6efa36dc6b69a5b30f8319b7e6da74eaa;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad

diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 68d225e6e..46e7193e2 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -1,24 +1,25 @@
 /*
     Copyright (C) 2013-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.
 
-    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
-    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  src/pixel_formats_test.cc
- *  @brief Make sure that Image::lines() and Image::bytes_per_pixel() return the right
+ *  @brief Make sure that Image::sample_size() and Image::bytes_per_pixel() return the right
  *  things for various pixel formats.
  *
  *  @see test/image_test.cc
@@ -31,6 +32,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include "lib/image.h"
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -42,7 +44,7 @@ struct Case
 {
 	Case (AVPixelFormat f, int c, int l0, int l1, int l2, float b0, float b1, float b2)
 		: format(f)
-		, components(c)
+		, planes(c)
 	{
 		lines[0] = l0;
 		lines[1] = l1;
@@ -51,9 +53,9 @@ struct Case
 		bpp[1] = b1;
 		bpp[2] = b2;
 	}
-	
+
 	AVPixelFormat format;
-	int components;
+	int planes;
 	int lines[3];
 	float bpp[3];
 };
@@ -82,10 +84,10 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
 		f->format = static_cast<int> (i->format);
 		av_frame_get_buffer (f, true);
 		Image t (f);
-		BOOST_CHECK_EQUAL(t.components(), i->components);
-		BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);
-		BOOST_CHECK_EQUAL(t.lines(1), i->lines[1]);
-		BOOST_CHECK_EQUAL(t.lines(2), i->lines[2]);
+		BOOST_CHECK_EQUAL(t.planes(), i->planes);
+		BOOST_CHECK_EQUAL(t.sample_size(0).height, i->lines[0]);
+		BOOST_CHECK_EQUAL(t.sample_size(1).height, i->lines[1]);
+		BOOST_CHECK_EQUAL(t.sample_size(2).height, i->lines[2]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(0), i->bpp[0]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(1), i->bpp[1]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(2), i->bpp[2]);