Hand-apply 63b62aa703c2628b27b577114081b265f237dadb from master;

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 12fe2b8a61d757f4c561bb4bcd867782d13edfdf..ef9c13c5a1c1e8b33500d72531bba395372d7563 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-2014 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,16 @@
 
 */
 
-#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/xyz_frame.h>
+#include <Magick++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -33,27 +34,40 @@ using std::cout;
 using std::list;
 using std::sort;
 using boost::shared_ptr;
-using boost::lexical_cast;
-using boost::bad_lexical_cast;
 
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
        : _film (film)
        , _image_content (content)
-       , _video_length (0)
 {
+#ifdef DCPOMATIC_IMAGE_MAGICK  
        using namespace MagickCore;
-       Magick::Image* image = new Magick::Image (content->path(0).string());
-       _video_size = libdcp::Size (image->columns(), image->rows());
-       delete image;
+#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");
+               if (!f) {
+                       throw FileError ("Could not open file for reading", path);
+               }
+               fread (buffer, 1, size, f);
+               fclose (f);
+               _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+               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 = ContentTime::from_seconds (Config::instance()->default_still_length());
        } else {
-               _video_length = _image_content->number_of_paths ();
+               _video_length = ContentTime::from_frames (_image_content->number_of_paths (), video_frame_rate ());
        }
 }
 
-libdcp::Size
+dcp::Size
 ImageExaminer::video_size () const
 {
        return _video_size.get ();