projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Reduce during J2K decode where possible for playback (#986).
[dcpomatic.git]
/
src
/
lib
/
magick_image_proxy.cc
diff --git
a/src/lib/magick_image_proxy.cc
b/src/lib/magick_image_proxy.cc
index 2d1867fcc14a972c2296465178c07f50e7a4321f..b8255c9ad92b70f3706d4b3801a25b744a8572e0 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-67,7
+67,7
@@
MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
}
shared_ptr<Image>
-MagickImageProxy::image (optional<dcp::NoteHandler>) const
+MagickImageProxy::image (optional<dcp::NoteHandler>
, optional<dcp::Size>
) const
{
boost::mutex::scoped_lock lm (_mutex);