projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b44c92e
)
Locking tweak.
author
Carl Hetherington
<cth@carlh.net>
Tue, 6 Nov 2018 22:11:25 +0000
(22:11 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 6 Nov 2018 22:11:25 +0000
(22:11 +0000)
src/lib/j2k_image_proxy.cc
patch
|
blob
|
history
diff --git
a/src/lib/j2k_image_proxy.cc
b/src/lib/j2k_image_proxy.cc
index 1422b6948426c9db21858a16d5dec27ae6d3b50e..698943922a204920930ac8d8d04ec3fa5fa495e3 100644
(file)
--- a/
src/lib/j2k_image_proxy.cc
+++ b/
src/lib/j2k_image_proxy.cc
@@
-171,7
+171,11
@@
J2KImageProxy::prepare (optional<dcp::Size> target_size) const
pair<shared_ptr<Image>, int>
J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
{
- return make_pair (_image, prepare(target_size));
+ int const r = prepare (target_size);
+ /* I think this is safe without a lock on mutex. _image is guaranteed to be
+ set up when prepare() has happened.
+ */
+ return make_pair (_image, r);
}
void