X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=b8d2a6921c3df204e161a07835273b50a913c8fd;hb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;hp=84b0b75c9732a4cd47dc30e1698ee1a82335c675;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 84b0b75c9..b8d2a6921 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -100,13 +100,12 @@ ImageContent::as_xml (xmlpp::Node* node) const } void -ImageContent::examine (shared_ptr job) +ImageContent::examine (shared_ptr job, bool calculate_digest) { - job->sub (_("Computing digest")); - Content::examine (job); + Content::examine (job, calculate_digest); shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); shared_ptr examiner (new ImageExaminer (film, shared_from_this(), job)); take_from_video_examiner (examiner); @@ -127,7 +126,7 @@ DCPTime ImageContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate())); }