Move make_black_test into image_test.

3 files changed, 66 insertions, 101 deletions

diff --git a/test/image_test.cc b/test/image_test.cc
index 0aa450321..bf7effe09 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -413,3 +413,69 @@ BOOST_AUTO_TEST_CASE (fade_test)
 	fade_test_format_red   (AV_PIX_FMT_RGB48LE,   0.5, "rgb48le_50");
 	fade_test_format_red   (AV_PIX_FMT_RGB48LE,   1,   "rgb48le_100");
 }
+
+
+BOOST_AUTO_TEST_CASE (make_black_test)
+{
+	dcp::Size in_size (512, 512);
+	dcp::Size out_size (1024, 1024);
+
+	list<AVPixelFormat> pix_fmts;
+	pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2
+	pix_fmts.push_back (AV_PIX_FMT_ARGB);
+	pix_fmts.push_back (AV_PIX_FMT_RGBA);
+	pix_fmts.push_back (AV_PIX_FMT_ABGR);
+	pix_fmts.push_back (AV_PIX_FMT_BGRA);
+	pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0
+	pix_fmts.push_back (AV_PIX_FMT_YUV411P);
+	pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUV444P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_UYVY422);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ420P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ422P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVJ444P);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10LE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA422P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA444P16BE);
+	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE);
+	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 ();
+		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
+
+		uint8_t* p = bar->data()[0];
+		for (int y = 0; y < bar->size().height; ++y) {
+			uint8_t* q = p;
+			for (int x = 0; x < bar->line_size()[0]; ++x) {
+				if (*q != 0) {
+					std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n";
+				}
+				BOOST_CHECK_EQUAL (*q++, 0);
+			}
+			p += bar->stride()[0];
+		}
+
+		++N;
+	}
+}
diff --git a/test/make_black_test.cc b/test/make_black_test.cc
deleted file mode 100644
index 2ed5db8ef..000000000
--- a/test/make_black_test.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/** @file  test/make_black_test.cc
- *  @brief Check that Image::make_black works and doesn't use values which crash
- *  sws_scale().
- *  @ingroup selfcontained
- *  @see test/image_test.cc
- */
-
-#include <boost/test/unit_test.hpp>
-#include <dcp/util.h>
-extern "C" {
-#include <libavutil/pixfmt.h>
-}
-#include "lib/image.h"
-
-using std::list;
-
-BOOST_AUTO_TEST_CASE (make_black_test)
-{
-	dcp::Size in_size (512, 512);
-	dcp::Size out_size (1024, 1024);
-
-	list<AVPixelFormat> pix_fmts;
-	pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2
-	pix_fmts.push_back (AV_PIX_FMT_ARGB);
-	pix_fmts.push_back (AV_PIX_FMT_RGBA);
-	pix_fmts.push_back (AV_PIX_FMT_ABGR);
-	pix_fmts.push_back (AV_PIX_FMT_BGRA);
-	pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0
-	pix_fmts.push_back (AV_PIX_FMT_YUV411P);
-	pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUV444P9BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE);
-	pix_fmts.push_back (AV_PIX_FMT_UYVY422);
-	pix_fmts.push_back (AV_PIX_FMT_YUVJ420P);
-	pix_fmts.push_back (AV_PIX_FMT_YUVJ422P);
-	pix_fmts.push_back (AV_PIX_FMT_YUVJ444P);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P9LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA422P9LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA444P9LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P10LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA422P10LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA444P10LE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA422P16BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA444P16BE);
-	pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE);
-	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 ();
-		boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false);
-
-		uint8_t* p = bar->data()[0];
-		for (int y = 0; y < bar->size().height; ++y) {
-			uint8_t* q = p;
-			for (int x = 0; x < bar->line_size()[0]; ++x) {
-				if (*q != 0) {
-					std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n";
-				}
-				BOOST_CHECK_EQUAL (*q++, 0);
-			}
-			p += bar->stride()[0];
-		}
-
-		++N;
-	}
-}
diff --git a/test/wscript b/test/wscript
index aa535ba27..ec01bf4f8 100644
--- a/test/wscript
+++ b/test/wscript
@@ -93,7 +93,6 @@ def build(bld):
                  j2k_bandwidth_test.cc
                  job_test.cc
                  kdm_naming_test.cc
-                 make_black_test.cc
                  markers_test.cc
                  no_use_video_test.cc
                  optimise_stills_test.cc