Fix write_frame_info again.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 299f7f38d04f713aa185f45dae7119db7910bac4..bb0f365d62c1423e159a7baf3a5e23f6be393ab0 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
-#include <dcp/xyz_frame.h>
+#include "compose.hpp"
+#include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <Magick++.h>
 #include <iostream>
@@ -41,13 +42,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 +69,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 ();
        }
 }
 
@@ -82,9 +81,9 @@ ImageExaminer::video_size () const
        return _video_size.get ();
 }
 
-optional<float>
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
        /* Don't know */
-       return optional<float> ();
+       return optional<double> ();
 }