projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
5d17098
)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
author
Carl Hetherington
<cth@carlh.net>
Thu, 31 Aug 2017 09:25:31 +0000
(10:25 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 31 Aug 2017 09:25:31 +0000
(10:25 +0100)
src/lib/magick_image_proxy.cc
patch
|
blob
|
history
diff --git
a/src/lib/magick_image_proxy.cc
b/src/lib/magick_image_proxy.cc
index 55795910553f422564fe2656cdb76632aac247e9..fbb08b7b081229372ddb8fd83bc32f6607971e5e 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-109,7
+109,7
@@
MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
are very wrong. To prevent this, set the image colour space to RGB to stop the ::colorSpace call below doing
anything. See #1123 and others.
*/
-
SetImageColorspace(magick_image->image(), Magick::RGBColorspace)
;
+
magick_image->image()->colorspace = Magick::RGBColorspace
;
}
magick_image->colorSpace(Magick::RGBColorspace);