X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=836e74f52753a66f525b92e291cb4eb7cd8c11a4;hb=d291ce8580aabc2e4340c9887ea1733325bb1b80;hp=50770a6875ce2e2f05f9685f2319eb2fdc651d40;hpb=48b82de5b6e8e07330a2f72dbddd8d9830fe047e;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 50770a687..836e74f52 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -385,7 +385,7 @@ wait_for_jobs () JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) { while (signal_manager->ui_idle ()) {} - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); } if (jm->errors ()) { @@ -417,11 +417,11 @@ wait_for_jobs () } void -write_image (shared_ptr image, boost::filesystem::path file, string format) +write_image (shared_ptr image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type) { using namespace MagickCore; - Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]); + Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]); m.write (file.string ()); }