From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 Nov 2018 22:11:25 +0000 (+0000)
Subject: Locking tweak.
X-Git-Tag: v2.13.67~8
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=24fbd3513614dba8f2e5ac16b86576d39f1dc6c0;hp=b44c92e5aed634eb4cbb2ed4aaafc57a66f275e5;p=dcpomatic.git

Locking tweak.
---

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