diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:11:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:11:25 +0000 |
| commit | 24fbd3513614dba8f2e5ac16b86576d39f1dc6c0 (patch) | |
| tree | 1d1bff1e53ddf68ba5834100219ca1a5da5859d6 /src/lib/j2k_image_proxy.cc | |
| parent | b44c92e5aed634eb4cbb2ed4aaafc57a66f275e5 (diff) | |
Locking tweak.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 1422b6948..698943922 100644 --- 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 |