Fix colour range in XYZ -> RGBA.

[libdcp.git] / src / reel_picture_asset.cc

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 7099d7d2f7dfa4be7c4f26c873a52d09ff56687d..096d3476d08608acfcbf4b4982d8ea41263426bc 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -49,7 +49,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr
        , _frame_rate (asset->frame_rate ())
        , _screen_aspect_ratio (asset->screen_aspect_ratio ())
 {
-       
+
 }
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
@@ -60,13 +60,13 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
        try {
                _screen_aspect_ratio = Fraction (node->string_child ("ScreenAspectRatio"));
        } catch (XMLError& e) {
-               /* Maybe it's not a fraction */
-       }
-       try {
-               float f = node->number_child<float> ("ScreenAspectRatio");
-               _screen_aspect_ratio = Fraction (f * 1000, 1000);
-       } catch (bad_cast& e) {
+               /* It's not a fraction */
+               try {
+                       float f = node->number_child<float> ("ScreenAspectRatio");
+                       _screen_aspect_ratio = Fraction (f * 1000, 1000);
+               } catch (bad_cast& e) {
 
+               }
        }
 }
 
@@ -77,7 +77,7 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 
        /* Find <MainPicture> */
        xmlpp::Node* mp = find_child (node, cpl_node_name ());
-       
+
        mp->add_child ("FrameRate")->add_child_text (String::compose ("%1 %2", _frame_rate.numerator, _frame_rate.denominator));
        if (standard == INTEROP) {
                stringstream s;
@@ -108,7 +108,7 @@ ReelPictureAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt
        if (!ReelAsset::equals (other, opt, note)) {
                return false;
        }
-       
+
        shared_ptr<const ReelPictureAsset> rpa = dynamic_pointer_cast<const ReelPictureAsset> (other);
        if (!rpa) {
                return false;