Take a JPEG2000 header marked as SRGB to mean that no XYZ -> RGB conversion should...

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 1fd9cd554a6880140ef0caa0bcab081a93f56ff4..b2f9623238814dd090f2d27cdcb7cfb7e774d0e1 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -24,8 +24,8 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <dcp/xyz_image.h>
 #include <Magick++.h>
 #include <iostream>
 
@@ -68,11 +68,9 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
        }
 
        if (content->still ()) {
-               _video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
+               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
        } else {
-               _video_length = ContentTime::from_frames (
-                       _image_content->number_of_paths (), video_frame_rate().get_value_or (24)
-                       );
+               _video_length = _image_content->number_of_paths ();
        }
 }