diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-02 21:20:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-02 21:20:35 +0100 |
| commit | 956da4b106e14c49b179176acf6484c479c21094 (patch) | |
| tree | 0fee47183fd58dcf90ef059171c2e73d9916bb89 /src/lib/imagemagick_decoder.cc | |
| parent | 20cd8bdecb9667f7d838dbb7210f3e1a4765c662 (diff) | |
Various fixes.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 508863e3e..dff177548 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -61,12 +61,14 @@ ImageMagickDecoder::video_length () const bool ImageMagickDecoder::pass () { - if (_position > 0 && _position < _imagemagick_content->video_length ()) { + if (_position < 0 || _position >= _imagemagick_content->video_length ()) { + return true; + } + + if (have_last_video ()) { repeat_last_video (); _position++; return false; - } else if (_position >= _imagemagick_content->video_length ()) { - return true; } Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ()); |