diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | test/test.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/test.cc b/test/test.cc index 32d32f988..7bc75468c 100644 --- a/test/test.cc +++ b/test/test.cc @@ -513,7 +513,7 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file, string { using namespace MagickCore; - Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]); + Magick::Image m (static_cast<size_t>(image->size().width), static_cast<size_t>(image->size().height), format.c_str(), pixel_type, reinterpret_cast<void *>(image->data()[0])); m.write (file.string ()); } diff --git a/test/test.h b/test/test.h index 77108af46..b620a68a0 100644 --- a/test/test.h +++ b/test/test.h @@ -18,7 +18,10 @@ */ +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include <Magick++.h> +DCPOMATIC_ENABLE_WARNINGS #include <boost/filesystem.hpp> #include <boost/shared_ptr.hpp> |