Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index cea5dfea7d1ea5addb5540a9cf0999ec735ccea0..bb0f365d62c1423e159a7baf3a5e23f6be393ab0 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -24,6 +24,7 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include "compose.hpp"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <Magick++.h>
@@ -41,7 +42,7 @@ 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 ();
@@ -80,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> ();
 }