Attempt to fix test idle hacks.

[dcpomatic.git] / test / pixel_formats_test.cc

diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 68d225e6efa36dc6b69a5b30f8319b7e6da74eaa..da675f5a8535791aa321d168909b9b07a5e5dbff 100644 (file)
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -18,7 +18,7 @@
 */
 
 /** @file  src/pixel_formats_test.cc
- *  @brief Make sure that Image::lines() and Image::bytes_per_pixel() return the right
+ *  @brief Make sure that Image::sample_size() and Image::bytes_per_pixel() return the right
  *  things for various pixel formats.
  *
  *  @see test/image_test.cc
@@ -31,6 +31,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include "lib/image.h"
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -42,7 +43,7 @@ struct Case
 {
        Case (AVPixelFormat f, int c, int l0, int l1, int l2, float b0, float b1, float b2)
                : format(f)
-               , components(c)
+               , planes(c)
        {
                lines[0] = l0;
                lines[1] = l1;
@@ -51,9 +52,9 @@ struct Case
                bpp[1] = b1;
                bpp[2] = b2;
        }
-       
+
        AVPixelFormat format;
-       int components;
+       int planes;
        int lines[3];
        float bpp[3];
 };
@@ -82,10 +83,10 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
                f->format = static_cast<int> (i->format);
                av_frame_get_buffer (f, true);
                Image t (f);
-               BOOST_CHECK_EQUAL(t.components(), i->components);
-               BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);
-               BOOST_CHECK_EQUAL(t.lines(1), i->lines[1]);
-               BOOST_CHECK_EQUAL(t.lines(2), i->lines[2]);
+               BOOST_CHECK_EQUAL(t.planes(), i->planes);
+               BOOST_CHECK_EQUAL(t.sample_size(0).height, i->lines[0]);
+               BOOST_CHECK_EQUAL(t.sample_size(1).height, i->lines[1]);
+               BOOST_CHECK_EQUAL(t.sample_size(2).height, i->lines[2]);
                BOOST_CHECK_EQUAL(t.bytes_per_pixel(0), i->bpp[0]);
                BOOST_CHECK_EQUAL(t.bytes_per_pixel(1), i->bpp[1]);
                BOOST_CHECK_EQUAL(t.bytes_per_pixel(2), i->bpp[2]);