diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | TO_PORT | 1 | ||||
| -rw-r--r-- | src/lib/dcp_content.cc | 2 | ||||
| -rw-r--r-- | src/lib/image_content.cc | 12 | ||||
| -rw-r--r-- | src/lib/types.h | 2 | ||||
| -rw-r--r-- | src/lib/video_content.cc | 6 | ||||
| -rw-r--r-- | src/lib/video_content.h | 2 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 1 |
8 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2015-02-10 c.hetherington <cth@carlh.net> + + * Default to no colour conversion for + JPEG2000 and DCP content (#445). + 2015-02-06 Carl Hetherington <cth@carlh.net> * Version 2.0.40 released. @@ -1,3 +1,4 @@ e6c9d208c52fb6f8bc29469e7d263bd03b22fe48 31894d178c8f6a3378b1c25c7ea1971f78759156 bb2bdf010dd2ea813f9ac7af5023ce39cf14f572 +c065accc4b4c6ed268e7fccea77a958473be7785 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 3f3cb1b94..51c7f8549 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -47,6 +47,8 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p) , _kdm_valid (false) { read_directory (p); + /* Default to no colour conversion for DCPs */ + unset_colour_conversion (false); } DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version) diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 1dbd7871b..4073cd52c 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -37,12 +37,19 @@ 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; + } } } @@ -52,6 +59,11 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p) sort (_paths.begin(), _paths.end()); } + + if (have_j2k) { + /* We default to no colour conversion if we have JPEG2000 files */ + unset_colour_conversion (); + } } diff --git a/src/lib/types.h b/src/lib/types.h index f554c4dd9..12a7897dc 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -46,7 +46,7 @@ namespace xmlpp { * with servers. Intended to be bumped when incompatibilities * are introduced. */ -#define SERVER_LINK_VERSION 2 +#define SERVER_LINK_VERSION 3 typedef std::vector<boost::shared_ptr<Content> > ContentList; typedef std::vector<boost::shared_ptr<VideoContent> > VideoContentList; diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 823517bfc..64c51be99 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -393,14 +393,16 @@ VideoContent::video_size_after_3d_split () const } void -VideoContent::unset_colour_conversion () +VideoContent::unset_colour_conversion (bool signal) { { boost::mutex::scoped_lock lm (_mutex); _colour_conversion = boost::optional<ColourConversion> (); } - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 320926190..792929419 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -86,7 +86,7 @@ public: void set_bottom_crop (int); void set_scale (VideoContentScale); - void unset_colour_conversion (); + void unset_colour_conversion (bool signal = true); void set_colour_conversion (ColourConversion); void set_default_colour_conversion (bool signal = true); diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 7b4d02f38..d110ac3fd 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -190,6 +190,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Adam Colt")); tested_by.Add (wxT ("John Convertino")); tested_by.Add (wxT ("Andreas Eli")); + tested_by.Add (wxT ("Jose Angel Velasco Fernandez")); tested_by.Add (wxT ("Maurizio Giampà")); tested_by.Add (wxT ("Luke Granger-Brown")); tested_by.Add (wxT ("Sumit Guha")); |