#include "i18n.h"
+#include "image_filename_sorter.cc"
+
using std::string;
using std::cout;
using boost::shared_ptr;
: Content (f)
, VideoContent (f)
{
- if (boost::filesystem::is_regular_file (p)) {
+ bool have_j2k = false;
+ if (boost::filesystem::is_regular_file (p) && valid_image_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;
+ }
}
}
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);
}
}
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);
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()));
}