X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frgb_xyz_test.cc;h=69a4d612781c8ab75a3ed8b53e253a1e15772c00;hb=e61267217a8ca7e65ad42bf34b6488b92eca6389;hp=cf42957b2597868cf07db129822af742bb79a2d3;hpb=a641fdc912a3f0749015decdf9e23ff15186ef78;p=libdcp.git

diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index cf42957b..69a4d612 100644
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,11 +15,26 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "rgb_xyz.h"
 #include "openjpeg_image.h"
 #include "colour_conversion.h"
+#include "stream_operators.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/scoped_array.hpp>
@@ -28,7 +43,8 @@ using std::max;
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using boost::scoped_array;
 
@@ -50,7 +66,7 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
 		}
 	}
 
-	shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ());
+	auto xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz());
 
 	for (int y = 0; y < size.height; ++y) {
 		uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
@@ -110,14 +126,14 @@ static list<string> notes;
 static void
 note_handler (dcp::NoteType n, string s)
 {
-	BOOST_REQUIRE_EQUAL (n, dcp::DCP_NOTE);
+	BOOST_REQUIRE_EQUAL (n, dcp::NoteType::NOTE);
 	notes.push_back (s);
 }
 
 /** Check that xyz_to_rgb clamps XYZ values correctly */
 BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 {
-	shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (2, 2)));
+	auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(2, 2));
 
 	xyz->data(0)[0] = -4;
 	xyz->data(0)[1] = 6901;
@@ -141,7 +157,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 
 	/* The 6 out-of-range samples should have been noted */
 	BOOST_REQUIRE_EQUAL (notes.size(), 6);
-	list<string>::const_iterator i = notes.begin ();
+	auto i = notes.begin ();
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
@@ -153,7 +169,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 	   as inputs at the extremes (0 and 4095).
 	*/
 
-	uint16_t* buffer = reinterpret_cast<uint16_t*> (rgb.get ());
+	auto buffer = reinterpret_cast<uint16_t*> (rgb.get ());
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 0], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 1], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 2], buffer[2 * 3 + 2]);