projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 84b0b75c9732a4cd47dc30e1698ee1a82335c675..1dbd7871b9f9a22d51f2a296094209499922bb87 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-102,11
+102,10
@@
ImageContent::as_xml (xmlpp::Node* node) const
void
ImageContent::examine (shared_ptr<Job> job)
{
void
ImageContent::examine (shared_ptr<Job> job)
{
- job->sub (_("Computing digest"));
Content::examine (job);
shared_ptr<const Film> film = _film.lock ();
Content::examine (job);
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);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
take_from_video_examiner (examiner);
@@
-127,7
+126,7
@@
DCPTime
ImageContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
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()));
}
return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
}