test/data updates.

[dcpomatic.git] / test / image_test.cc

diff --git a/test/image_test.cc b/test/image_test.cc
index ee4819d6b13998135faf7fd2322874077bd147c6..5561f021c5a57afb3c489910a6de6213a9778ce3 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -26,7 +26,6 @@
 #include <boost/test/unit_test.hpp>
 #include <Magick++.h>
 #include "lib/image.h"
-#include "lib/scaler.h"
 
 using std::string;
 using std::list;
@@ -157,7 +156,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2)
        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);
+       image = image->scale (image->size(), dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
 
        /* Check that its still black after the crop */
        uint8_t* p = image->data()[0];
@@ -172,53 +171,6 @@ BOOST_AUTO_TEST_CASE (crop_image_test2)
        }
 }
 
-static
-boost::shared_ptr<Image>
-read_file (string file)
-{
-       Magick::Image magick_image (file.c_str ());
-       dcp::Size size (magick_image.columns(), magick_image.rows());
-
-       boost::shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
-
-       using namespace MagickCore;
-       
-       uint8_t* p = image->data()[0];
-       for (int y = 0; y < size.height; ++y) {
-               uint8_t* q = p;
-               for (int x = 0; x < size.width; ++x) {
-                       Magick::Color c = magick_image.pixelColor (x, y);
-                       *q++ = c.redQuantum() * 255 / QuantumRange;
-                       *q++ = c.greenQuantum() * 255 / QuantumRange;
-                       *q++ = c.blueQuantum() * 255 / QuantumRange;
-               }
-               p += image->stride()[0];
-       }
-
-       return image;
-}
-
-static
-void
-write_file (shared_ptr<Image> image, string file)
-{
-       using namespace MagickCore;
-       
-       Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0));
-       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) {
-                       Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256);
-                       magick_image.pixelColor (x, y, c);
-                       q += 3;
-               }
-               p += image->stride()[0];
-       }
-       
-       magick_image.write (file.c_str ());
-}
-
 static
 void
 crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, dcp::Size inter_size, dcp::Size out_size)
@@ -237,13 +189,13 @@ crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop,
                                
        /* Convert using separate methods */
        boost::shared_ptr<Image> sep = test->crop (crop, true);
-       sep = sep->scale (inter_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+       sep = sep->scale (inter_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
        boost::shared_ptr<Image> sep_container (new Image (PIX_FMT_RGB24, out_size, true));
        sep_container->make_black ();
        sep_container->copy (sep, Position<int> ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2));
 
        /* Convert using the all-in-one method */
-       shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+       shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
 
        /* Compare */
        BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width);