float -> double in a few places.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index ef9c13c5a1c1e8b33500d72531bba395372d7563..6ad32f511e1971ddd8d24123e4bdf0ba2bcfe696 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 <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
 #include <Magick++.h>
 #include <iostream>
 
@@ -34,25 +35,31 @@ using std::cout;
 using std::list;
 using std::sort;
 using boost::shared_ptr;
+using boost::optional;
 
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _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);
-               uint8_t* buffer = new uint8_t[size];
-               FILE* f = fopen_boost (path, "r");
+               FILE* f = fopen_boost (path, "rb");
                if (!f) {
                        throw FileError ("Could not open file for reading", path);
                }
+               uint8_t* buffer = new uint8_t[size];
                fread (buffer, 1, size, f);
                fclose (f);
-               _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+               try {
+                       _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+               } catch (dcp::DCPReadError& e) {
+                       delete[] buffer;
+                       throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
+               }
                delete[] buffer;
        } else {
                Magick::Image* image = new Magick::Image (content->path(0).string());
@@ -61,9 +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 ());
+               _video_length = _image_content->number_of_paths ();
        }
 }
 
@@ -73,13 +80,9 @@ ImageExaminer::video_size () const
        return _video_size.get ();
 }
 
-float
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
-       boost::shared_ptr<const Film> f = _film.lock ();
-       if (!f) {
-               return 24;
-       }
-
-       return f->video_frame_rate ();
+       /* Don't know */
+       return optional<double> ();
 }