/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
using std::cerr;
using std::list;
using boost::shared_ptr;
+using boost::scoped_array;
boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
/* buffer_size is in frames */
sf_count_t const buffer_size = 65536 * ref_info.channels;
- int32_t* ref_buffer = new int32_t[buffer_size];
- int32_t* check_buffer = new int32_t[buffer_size];
+ scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
+ scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
sf_count_t N = ref_info.frames;
while (N) {
sf_count_t this_time = min (buffer_size, N);
- sf_count_t r = sf_readf_int (ref_file, ref_buffer, this_time);
+ sf_count_t r = sf_readf_int (ref_file, ref_buffer.get(), this_time);
BOOST_CHECK_EQUAL (r, this_time);
- r = sf_readf_int (check_file, check_buffer, this_time);
+ r = sf_readf_int (check_file, check_buffer.get(), this_time);
BOOST_CHECK_EQUAL (r, this_time);
for (sf_count_t i = 0; i < this_time; ++i) {
options.max_std_dev_pixel_error = 5;
options.max_audio_sample_error = 255;
options.cpl_annotation_texts_can_differ = true;
- options.mxf_names_can_differ = true;
+ options.mxf_filenames_can_differ = true;
options.reel_hashes_can_differ = true;
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
void
write_image (shared_ptr<const Image> image, boost::filesystem::path file)
{
- using namespace MagickCore;
+#ifdef DCPOMATIC_IMAGE_MAGICK
+ using namespace MagickCore;
+#else
+ using namespace MagickLib;
+#endif
Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
m.write (file.string ());