projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::file_to_string().
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.cc
diff --git
a/src/lib/colour_conversion.cc
b/src/lib/colour_conversion.cc
index 57e73a5b5c02133b65d30b5d544cc48a7b03a130..6cf4ed646a6b9625e269f3eed5ccfd2b6dcd8357 100644
(file)
--- a/
src/lib/colour_conversion.cc
+++ b/
src/lib/colour_conversion.cc
@@
-95,7
+95,7
@@
ColourConversion::ColourConversion (cxml::NodePtr node, int version)
}
}
}
}
- _yuv_to_rgb = static_cast<dcp::YUVToRGB>
(node->optional_number_child<int>("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601
));
+ _yuv_to_rgb = static_cast<dcp::YUVToRGB>
(node->optional_number_child<int>("YUVToRGB").get_value_or(static_cast<int>(dcp::YUVToRGB::REC601)
));
auto m = node->node_children ("Matrix");
if (!m.empty ()) {
auto m = node->node_children ("Matrix");
if (!m.empty ()) {