projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lost recipients when sending KDM emails.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index 78201fc23d9d7b838d30ed6edbb0d09e4c258369..2291daecd7996f85e00ad9bdc7d6cc9a96e8be90 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-43,9
+43,9
@@
ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
}
bool
}
bool
-ImageDecoder::pass ()
+ImageDecoder::pass (
PassReason, bool
)
{
{
- if (_video_position >= _image_content->video_length()
.frames (_image_content->video_frame_rate ())
) {
+ if (_video_position >= _image_content->video_length()) {
return true;
}
return true;
}
@@
-61,7
+61,7
@@
ImageDecoder::pass ()
_image.reset (new MagickImageProxy (path));
}
}
_image.reset (new MagickImageProxy (path));
}
}
-
+
video (_image, _video_position);
++_video_position;
return false;
video (_image, _video_position);
++_video_position;
return false;
@@
-71,5
+71,5
@@
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
VideoDecoder::seek (time, accurate);
ImageDecoder::seek (ContentTime time, bool accurate)
{
VideoDecoder::seek (time, accurate);
- _video_position = time.frames (_image_content->video_frame_rate ());
+ _video_position = time.frames
_round
(_image_content->video_frame_rate ());
}
}