X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=82ebe0b1ff5e6825c0db29bbd92f8fc2495092f8;hb=8b6b8d85ae9a008ada08ce5c51c16ad2238239c9;hp=9dd3a1ba4e656484777dc6c7c4ca22e58afa105d;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index 9dd3a1ba4..82ebe0b1f 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -1,7 +1,31 @@
+/*
+    Copyright (C) 2012 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
+    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,
+    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.
+
+*/
+
+#include <boost/test/unit_test.hpp>
+#include "lib/image.h"
+#include "lib/scaler.h"
+
+using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
-	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), true);
+	Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), true);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	/* 160 is 150 aligned to the nearest 32 bytes */
 	BOOST_CHECK_EQUAL (s->stride()[0], 160);
@@ -12,7 +36,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (!s->data()[3]);
 
 	/* copy constructor */
-	SimpleImage* t = new SimpleImage (*s);
+	Image* t = new Image (*s);
 	BOOST_CHECK_EQUAL (t->components(), 1);
 	BOOST_CHECK_EQUAL (t->stride()[0], 160);
 	BOOST_CHECK_EQUAL (t->line_size()[0], 150);
@@ -28,7 +52,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
 	/* assignment operator */
-	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), false);
+	Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), false);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 160);
@@ -51,7 +75,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
-	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), false);
+	Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), false);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
@@ -61,7 +85,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (!s->data()[3]);
 
 	/* copy constructor */
-	SimpleImage* t = new SimpleImage (*s);
+	Image* t = new Image (*s);
 	BOOST_CHECK_EQUAL (t->components(), 1);
 	BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3);
@@ -77,7 +101,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
 	/* assignment operator */
-	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), true);
+	Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), true);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
@@ -101,9 +125,39 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 BOOST_AUTO_TEST_CASE (crop_image_test)
 {
 	/* This was to check out a bug with valgrind, and is probably not very useful */
-	shared_ptr<SimpleImage> image (new SimpleImage (PIX_FMT_YUV420P, libdcp::Size (16, 16), true));
+	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (16, 16), true));
 	image->make_black ();
 	Crop crop;
 	crop.top = 3;
 	image->crop (crop, false);
 }
+
+/* Test cropping of a YUV 4:2:0 image by 1 pixel, which used to fail because
+   the U/V copying was not rounded up to the next sample.
+*/
+BOOST_AUTO_TEST_CASE (crop_image_test2)
+{
+	/* Here's a 1998 x 1080 image which is black */
+	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true));
+	image->make_black ();
+
+	/* Crop it by 1 pixel */
+	Crop crop;
+	crop.left = 1;
+	image = image->crop (crop, true);
+
+	/* Convert it back to RGB to make comparison to black easier */
+	image = image->scale (image->size(), Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+
+	/* Check that its still black after the crop */
+	uint8_t* p = image->data()[0];
+	for (int y = 0; y < image->size().height; ++y) {
+		uint8_t* q = p;
+		for (int x = 0; x < image->size().width; ++x) {
+			BOOST_CHECK_EQUAL (*q++, 0);
+			BOOST_CHECK_EQUAL (*q++, 0);
+			BOOST_CHECK_EQUAL (*q++, 0);
+		}
+		p += image->stride()[0];
+	}
+}