Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 502e8adbe909da9dbeac4240d395b1dca020bdec..7a93b5cd1439a9bfa0757d6946e965ffa32c5788 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -24,8 +24,9 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include "compose.hpp"
+#include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
-#include <dcp/xyz_image.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);
                }
@@ -80,9 +81,14 @@ ImageExaminer::video_size () const
        return _video_size.get ();
 }
 
-optional<float>
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
+       if (_image_content->video_frame_rate() != 0) {
+               /* The content already knows what frame rate it should be */
+               return _image_content->video_frame_rate();
+       }
+
        /* Don't know */
-       return optional<float> ();
+       return optional<double> ();
 }