Hand-apply 71a4c0f5440688a38a2bb34170a3ccf9b1ea598f from 1.x;

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 07f047ddd53bfc9c4651dca19d2b1b12fe8f753d..a9cb148c2447920a1db51a8964937fc12d8cffa0 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -20,28 +20,38 @@
 #include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
-#include "config.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
+#include "frame_rate_change.h"
+#include "exceptions.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
+#include "image_filename_sorter.cc"
+
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
        : Content (f)
        , VideoContent (f)
 {
+       bool have_j2k = false;
        if (boost::filesystem::is_regular_file (p)) {
                _paths.push_back (p);
+               if (valid_j2k_file (p)) {
+                       have_j2k = true;
+               }
        } else {
                for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
                        if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
                                _paths.push_back (i->path ());
+                               if (valid_j2k_file (i->path ())) {
+                                       have_j2k = true;
+                               }
                        }
                }
 
@@ -49,7 +59,12 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
                        throw FileError (_("No valid image files were found in the folder."), p);
                }
                                
-               sort (_paths.begin(), _paths.end());
+               sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+       }
+
+       if (have_j2k) {
+               /* We default to no colour conversion if we have JPEG2000 files */
+               unset_colour_conversion (false);
        }
 }
 
@@ -101,16 +116,13 @@ ImageContent::as_xml (xmlpp::Node* node) const
 void
 ImageContent::examine (shared_ptr<Job> job)
 {
-       job->sub (_("Computing digest"));
        Content::examine (job);
 
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
        
        shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
        take_from_video_examiner (examiner);
-       set_video_length (examiner->video_length ());
 }
 
 void
@@ -128,14 +140,14 @@ DCPTime
 ImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
        return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string
 ImageContent::identifier () const
 {
-       stringstream s;
+       SafeStringStream s;
        s << VideoContent::identifier ();
        s << "_" << video_length().get();
        return s.str ();