Fix truncated log timestamps in at least some cases.

[dcpomatic.git] / test / image_test.cc

diff --git a/test/image_test.cc b/test/image_test.cc
index cb1aa35d7e7dd9c0f71628ed5c576970467e0b29..55fbb990774b8c2009eb1852c5e7fb5157341639 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -26,6 +26,7 @@
 #include <boost/test/unit_test.hpp>
 #include <Magick++.h>
 #include "lib/image.h"
+#include <iostream>
 
 using std::string;
 using std::list;
@@ -34,8 +35,8 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
-       Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true);
-       BOOST_CHECK_EQUAL (s->components(), 1);
+       Image* s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), true);
+       BOOST_CHECK_EQUAL (s->planes(), 1);
        /* 160 is 150 aligned to the nearest 32 bytes */
        BOOST_CHECK_EQUAL (s->stride()[0], 160);
        BOOST_CHECK_EQUAL (s->line_size()[0], 150);
@@ -46,7 +47,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
        /* copy constructor */
        Image* t = new Image (*s);
-       BOOST_CHECK_EQUAL (t->components(), 1);
+       BOOST_CHECK_EQUAL (t->planes(), 1);
        BOOST_CHECK_EQUAL (t->stride()[0], 160);
        BOOST_CHECK_EQUAL (t->line_size()[0], 150);
        BOOST_CHECK (t->data()[0]);
@@ -61,9 +62,9 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
        BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
        /* assignment operator */
-       Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
+       Image* u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), false);
        *u = *s;
-       BOOST_CHECK_EQUAL (u->components(), 1);
+       BOOST_CHECK_EQUAL (u->planes(), 1);
        BOOST_CHECK_EQUAL (u->stride()[0], 160);
        BOOST_CHECK_EQUAL (u->line_size()[0], 150);
        BOOST_CHECK (u->data()[0]);
@@ -84,8 +85,8 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
-       Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false);
-       BOOST_CHECK_EQUAL (s->components(), 1);
+       Image* s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), false);
+       BOOST_CHECK_EQUAL (s->planes(), 1);
        BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
        BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
        BOOST_CHECK (s->data()[0]);
@@ -95,7 +96,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 
        /* copy constructor */
        Image* t = new Image (*s);
-       BOOST_CHECK_EQUAL (t->components(), 1);
+       BOOST_CHECK_EQUAL (t->planes(), 1);
        BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3);
        BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3);
        BOOST_CHECK (t->data()[0]);
@@ -110,9 +111,9 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
        BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
        /* assignment operator */
-       Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
+       Image* u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), true);
        *u = *s;
-       BOOST_CHECK_EQUAL (u->components(), 1);
+       BOOST_CHECK_EQUAL (u->planes(), 1);
        BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
        BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3);
        BOOST_CHECK (u->data()[0]);