Rename CPL/PKL files to be {cpl,pkl}_uuid.xml rather than

[libdcp.git] / test / rgb_xyz_test.cc

diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index da897b9f5f6c6c5c215c581e5758b960ea399e4b..0b42789386abbc2cb62800d75e21224844277879 100644 (file)
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -17,47 +17,19 @@
 
 */
 
-#include "image.h"
 #include "rgb_xyz.h"
-#include "xyz_frame.h"
+#include "xyz_image.h"
 #include "colour_conversion.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
+#include <boost/scoped_array.hpp>
 
 using std::max;
 using std::list;
 using std::string;
 using boost::shared_ptr;
 using boost::optional;
-
-class SimpleImage : public dcp::Image
-{
-public:
-       SimpleImage (dcp::Size size)
-               : Image (size)
-       {
-               /* 48bpp */
-               _stride[0] = _size.width * 6;
-               _data[0] = new uint8_t[size.height * stride()[0]];
-       }
-
-       ~SimpleImage ()
-       {
-               delete[] _data[0];
-       }
-
-       uint8_t * const * data () const {
-               return _data;
-       }
-
-       int const * stride () const {
-               return _stride;
-       }
-
-private:
-       uint8_t* _data[1];
-       int _stride[1];
-};
+using boost::scoped_array;
 
 /** Convert a test image from sRGB to XYZ and check that the transforms are right */
 BOOST_AUTO_TEST_CASE (rgb_xyz_test)
@@ -65,9 +37,9 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
        unsigned int seed = 0;
        dcp::Size const size (640, 480);
 
-       shared_ptr<const dcp::Image> rgb (new SimpleImage (size));
+       scoped_array<uint8_t> rgb (new uint8_t[size.width * size.height * 6]);
        for (int y = 0; y < size.height; ++y) {
-               uint16_t* p = reinterpret_cast<uint16_t*> (rgb->data()[0] + y * rgb->stride()[0]);
+               uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
                for (int x = 0; x < size.width; ++x) {
                        /* Write a 12-bit random number for each component */
                        for (int c = 0; c < 3; ++c) {
@@ -77,10 +49,10 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
                }
        }
 
-       shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (rgb, dcp::ColourConversion::srgb_to_xyz ());
+       shared_ptr<dcp::XYZImage> 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->data()[0] + y * rgb->stride()[0]);
+               uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
                for (int x = 0; x < size.width; ++x) {
 
                        double cr = *p++ / 65535.0;
@@ -144,7 +116,7 @@ note_handler (dcp::NoteType n, string s)
 /** Check that xyz_to_rgb clamps XYZ values correctly */
 BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 {
-       shared_ptr<dcp::XYZFrame> xyz (new dcp::XYZFrame (dcp::Size (2, 2)));
+       shared_ptr<dcp::XYZImage> xyz (new dcp::XYZImage (dcp::Size (2, 2)));
        
        xyz->data(0)[0] = -4;
        xyz->data(0)[1] = 6901;
@@ -159,10 +131,12 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
        xyz->data(2)[2] = 0;
        xyz->data(2)[3] = 4095;
 
-       shared_ptr<SimpleImage> image (new SimpleImage (dcp::Size (2, 2)));
+       scoped_array<uint8_t> rgb (new uint8_t[2 * 2 * 6]);
 
        notes.clear ();
-       dcp::xyz_to_rgb (xyz, dcp::ColourConversion::xyz_to_srgb (), image, boost::optional<dcp::NoteHandler> (boost::bind (&note_handler, _1, _2)));
+       dcp::xyz_to_rgb (
+               xyz, dcp::ColourConversion::srgb_to_xyz (), rgb.get(), 2 * 6, boost::optional<dcp::NoteHandler> (boost::bind (&note_handler, _1, _2))
+               );
 
        /* The 6 out-of-range samples should have been noted */
        BOOST_REQUIRE_EQUAL (notes.size(), 6);
@@ -178,7 +152,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
           as inputs at the extremes (0 and 4095).
        */
 
-       uint16_t* buffer = reinterpret_cast<uint16_t*> (image->data()[0]);
+       uint16_t* 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]);