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 2d150583a1186570e222fd4f15557a01097d487d..6ad32f511e1971ddd8d24123e4bdf0ba2bcfe696 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -17,15 +17,17 @@
 
 */
 
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <Magick++.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "film.h"
 #include "job.h"
 #include "exceptions.h"
 #include "config.h"
+#include "cross.h"
+#include <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
+#include <Magick++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -33,65 +35,54 @@ using std::cout;
 using std::list;
 using std::sort;
 using boost::shared_ptr;
-using boost::lexical_cast;
-using boost::bad_lexical_cast;
+using boost::optional;
 
-ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job> job)
+ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _film (film)
        , _image_content (content)
-       , _video_length (0)
 {
-       list<unsigned int> frames;
-       size_t const N = content->number_of_paths ();
-
-       for (size_t i = 0; i < N; ++i) {
-               boost::filesystem::path const p = content->path (i);
-               try {
-                       frames.push_back (lexical_cast<int> (p.stem().string()));
-               } catch (bad_lexical_cast &) {
-                       /* We couldn't turn that filename into a number; never mind */
+#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, "rb");
+               if (!f) {
+                       throw FileError ("Could not open file for reading", path);
                }
-               
-               if (!_video_size) {
-                       using namespace MagickCore;
-                       Magick::Image* image = new Magick::Image (p.string());
-                       _video_size = libdcp::Size (image->columns(), image->rows());
-                       delete image;
+               uint8_t* buffer = new uint8_t[size];
+               fread (buffer, 1, size, f);
+               fclose (f);
+               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 ()));
                }
-       
-               job->set_progress (float (i) / N);
-       }
-
-       frames.sort ();
-       
-       if (N > 1 && frames.front() != 0 && frames.front() != 1) {
-               throw StringError (String::compose (_("first frame in moving image directory is number %1"), frames.front ()));
-       }
-
-       if (N > 1 && frames.back() != frames.size() && frames.back() != (frames.size() - 1)) {
-               throw StringError (String::compose (_("there are %1 images in the directory but the last one is number %2"), frames.size(), frames.back ()));
+               delete[] buffer;
+       } else {
+               Magick::Image* image = new Magick::Image (content->path(0).string());
+               _video_size = dcp::Size (image->columns(), image->rows());
+               delete image;
        }
 
        if (content->still ()) {
-               _video_length = Config::instance()->default_still_length() * video_frame_rate();
+               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
        } else {
                _video_length = _image_content->number_of_paths ();
        }
 }
 
-libdcp::Size
+dcp::Size
 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> ();
 }