From 82efb1abd6a399917fa34a417039d58424236d23 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Aug 2015 14:19:03 +0100 Subject: [PATCH] Clean up slightly; use set_default_colour_conversion rather than doing things in the constructor. --- src/lib/image_content.cc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 37aa7cbc1..3d35b4eeb 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -27,6 +27,7 @@ #include "safe_stringstream.h" #include #include +#include #include "i18n.h" @@ -40,19 +41,12 @@ ImageContent::ImageContent (shared_ptr film, boost::filesystem::path : Content (film) , VideoContent (film) { - 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; - } } } @@ -62,11 +56,6 @@ ImageContent::ImageContent (shared_ptr film, boost::filesystem::path sort (_paths.begin(), _paths.end(), ImageFilenameSorter ()); } - - if (have_j2k) { - /* We default to no colour conversion if we have JPEG2000 files */ - unset_colour_conversion (false); - } } @@ -179,6 +168,14 @@ ImageContent::set_video_frame_rate (float r) void ImageContent::set_default_colour_conversion () { + BOOST_FOREACH (boost::filesystem::path i, _paths) { + if (valid_j2k_file (i)) { + /* We default to no colour conversion if we have JPEG2000 files */ + unset_colour_conversion (); + return; + } + } + bool const s = still (); boost::mutex::scoped_lock lm (_mutex); -- 2.30.2