}
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