summaryrefslogtreecommitdiff
path: root/src/lib/magick_image_proxy.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-29 16:57:33 +0000
committerCarl Hetherington <cth@carlh.net>2015-10-29 18:44:04 +0000
commitaa7edc3114fa3b7868088a9f8f22b5ee195a8668 (patch)
tree5e5fef8156320f47aaa7626e557f85e8eb236ff5 /src/lib/magick_image_proxy.cc
parente1c23a19b93d7bb66bd439af511d6666e56a7d29 (diff)
Fix incorrect colourspace conversion of XYZ content
when it is not being passed through as untouched JPEG2000 (#730).
Diffstat (limited to 'src/lib/magick_image_proxy.cc')
-rw-r--r--src/lib/magick_image_proxy.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index ccc0878d9..cb168ce63 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -149,3 +149,9 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
}
+
+AVPixelFormat
+MagickImageProxy::pixel_format () const
+{
+ return AV_PIX_FMT_RGB24;
+}