X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fimage_examiner.cc;h=79c9f727ceed7ba710546cb8d4292eb0f58a4df5;hb=a0614e6e3b566827381121fdb4ee73268281a70d;hp=1fd9cd554a6880140ef0caa0bcab081a93f56ff4;hpb=7a1bd472537fee593a3f088655324861d24e804b;p=dcpomatic.git

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 1fd9cd554..79c9f727c 100644
--- 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>
 
@@ -41,13 +41,13 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK	
+#ifdef DCPOMATIC_IMAGE_MAGICK
 	using namespace MagickCore;
 #endif
 	boost::filesystem::path path = content->path(0).string ();
 	if (valid_j2k_file (path)) {
 		boost::uintmax_t size = boost::filesystem::file_size (path);
-		FILE* f = fopen_boost (path, "r");
+		FILE* f = fopen_boost (path, "rb");
 		if (!f) {
 			throw FileError ("Could not open file for reading", path);
 		}
@@ -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 ();
 	}
 }