projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
724ffce
)
Missing Image/GraphicsMagick hack.
author
Carl Hetherington
<cth@carlh.net>
Sun, 26 Oct 2014 12:15:13 +0000
(12:15 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 26 Oct 2014 12:15:13 +0000
(12:15 +0000)
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 e5265187f57e3a67458d72a3a9f66e0133366f4b..d1aa890b7a2524bcaaea602dc3b224114d43158d 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-111,7
+111,11
@@
MagickImageProxy::image () const
/* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
uint8_t* p = _image->data()[0];
for (int i = 0; i < size.height; ++i) {
+#ifdef DCPOMATIC_IMAGE_MAGICK
using namespace MagickCore;
+#else
+ using namespace MagickLib;
+#endif
magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
p += _image->stride()[0];
}