More various KDM fixes.
[dcpomatic.git] / test / make_black_test.cc
index 4c282251448b1119af8943db6ddfdfaa0319e797..17c78d23110013c8202d002c30588781256569e0 100644 (file)
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include <libdcp/util.h>
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include "lib/image.h"
+#include "lib/scaler.h"
+
+using std::list;
+
 /* Check that Image::make_black works, and doesn't use values which crash
    sws_scale().
 */
@@ -43,7 +53,7 @@ BOOST_AUTO_TEST_CASE (make_black_test)
        for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
                boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
                foo->make_black ();
-               boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, Scaler::from_id ("bicubic"), true);
+               boost::shared_ptr<Image> bar = foo->scale (out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
                
                uint8_t* p = bar->data()[0];
                for (int y = 0; y < bar->size().height; ++y) {