diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-04 16:38:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-16 22:46:39 +0100 |
| commit | ed4fc06db6957b2b63b2400a737f47c18a1003be (patch) | |
| tree | e429ffc3df79e141dacb870ffe9d232e8b72efd4 /test/test.h | |
| parent | 81e40e7b915a55f8e5aa2db34ad809552b1534e3 (diff) | |
Fix incorrect images when cropping without stretch.
Always overallocate images so that Image::crop_scale_window is always
safe from over-reading buffers. Relates to #1654 and probably #1653.
Backported from 7b0372776ac4da6a8e4ff29f41a4f08b9b4de506 in v2.15.x.
Diffstat (limited to 'test/test.h')
| -rw-r--r-- | test/test.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test.h b/test/test.h index 86b13cde5..3a11effa1 100644 --- a/test/test.h +++ b/test/test.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ +#include <Magick++.h> #include <boost/filesystem.hpp> class Film; @@ -38,7 +39,7 @@ extern void check_file (boost::filesystem::path, boost::filesystem::path); extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance); extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 0.01); extern boost::filesystem::path test_film_dir (std::string); -extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format); +extern void write_image (boost::shared_ptr<const Image> image, boost::filesystem::path file, std::string format, MagickCore::StorageType pixel_type = MagickCore::CharPixel); boost::filesystem::path dcp_file (boost::shared_ptr<const Film> film, std::string prefix); void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref); extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film); |