diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
| commit | 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 (patch) | |
| tree | 203675d00d5cc004be6205218f835b6d7a10e925 /src/lib/image_content.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 132b26144..b8d2a6921 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -105,7 +105,7 @@ ImageContent::examine (shared_ptr<Job> job, bool calculate_digest) Content::examine (job, calculate_digest); shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job)); take_from_video_examiner (examiner); @@ -126,7 +126,7 @@ DCPTime ImageContent::full_length () const { shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate())); } |