Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 31d4cc41a6dc3f33836015a9d87b3a68a0a39ab2..0625f059b21089924fd5d543914948c62d07c09c 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -29,6 +29,7 @@
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -80,9 +81,9 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
                /* Version 1.x */
 
                if (node->bool_child ("InputGammaLinearised")) {
-                       _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
+                       _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<double> ("InputGamma"), 0.04045, 0.055, 12.92));
                } else {
-                       _in.reset (new dcp::GammaTransferFunction (node->number_child<float> ("InputGamma")));
+                       _in.reset (new dcp::GammaTransferFunction (node->number_child<double> ("InputGamma")));
                }
        }
 
@@ -149,6 +150,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("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));
@@ -170,7 +172,7 @@ ColourConversion::preset () const
 {
        vector<PresetColourConversion> presets = PresetColourConversion::all ();
        size_t i = 0;
-       while (i < presets.size() && (presets[i].conversion != *this)) {
+       while (i < presets.size() && presets[i].conversion != *this) {
                ++i;
        }
 
@@ -275,4 +277,3 @@ PresetColourConversion::from_id (string s)
 
        DCPOMATIC_ASSERT (false);
 }
-