pot/merge.

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

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index f17964ddccb0521cdcf9df31aa45832503ec2d9b..aa6b61fed29e3d861f118b0855ab6bf3ddb783d4 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -22,7 +22,7 @@
 #include "colour_conversion.h"
 #include "util.h"
 #include "digester.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <dcp/chromaticity.h>
 #include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
@@ -41,6 +41,7 @@ using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 vector<PresetColourConversion> PresetColourConversion::_presets;
 
@@ -151,7 +152,7 @@ ColourConversion::as_xml (xmlpp::Node* node) const
                in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
        }
 
-       node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (_yuv_to_rgb));
+       node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (static_cast<int> (_yuv_to_rgb)));
        node->add_child("RedX")->add_child_text (raw_convert<string> (_red.x));
        node->add_child("RedY")->add_child_text (raw_convert<string> (_red.y));
        node->add_child("GreenX")->add_child_text (raw_convert<string> (_green.x));