projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only take subtitle data into account for position() if there is nothing
[dcpomatic.git]
/
src
/
lib
/
j2k_image_proxy.cc
diff --git
a/src/lib/j2k_image_proxy.cc
b/src/lib/j2k_image_proxy.cc
index 1422b6948426c9db21858a16d5dec27ae6d3b50e..9893d65a63f2538e78b7f34c6a5f2d82ae50f6e1 100644
(file)
--- a/
src/lib/j2k_image_proxy.cc
+++ b/
src/lib/j2k_image_proxy.cc
@@
-169,9
+169,13
@@
J2KImageProxy::prepare (optional<dcp::Size> target_size) const
}
pair<shared_ptr<Image>, int>
}
pair<shared_ptr<Image>, int>
-J2KImageProxy::image (optional<dcp::
NoteHandler>, optional<dcp::
Size> target_size) const
+J2KImageProxy::image (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
}
void