Updated cs_CZ translation from Tomáš Begeni.

[dcpomatic.git] / src / lib / image_decoder.cc

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 2f7416c62630eaf740e4039532d71fb87e9d6ea4..ce5c8757f7f636adc40cdf9f5dd23e5daf3d10dc 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -18,35 +18,39 @@
 
 */
 
+
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
 #include "image_content.h"
 #include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
+#include "util.h"
 #include "video_content.h"
-#include "frame_interval_checker.h"
+#include "video_decoder.h"
 #include <boost/filesystem.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::make_shared;
 using std::shared_ptr;
 using dcp::Size;
 using namespace dcpomatic;
 
+
 ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
        : Decoder (film)
        , _image_content (c)
-       , _frame_video_position (0)
 {
        video = make_shared<VideoDecoder>(this, c);
 }
 
+
 bool
 ImageDecoder::pass ()
 {
@@ -69,9 +73,11 @@ ImageDecoder::pass ()
                        /* We can't extract image size from a JPEG2000 codestream without decoding it,
                           so pass in the image content's size here.
                        */
-                       _image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
+                       auto size = _image_content->video->size();
+                       DCPOMATIC_ASSERT(size);
+                       _image = make_shared<J2KImageProxy>(path, *size, pf);
                } else {
-                       _image = make_shared<FFmpegImageProxy>(path, _image_content->video->range());
+                       _image = make_shared<FFmpegImageProxy>(path);
                }
        }
 
@@ -80,6 +86,7 @@ ImageDecoder::pass ()
        return false;
 }
 
+
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {