X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=d1654e50a05adae169fea1c9bc7955834625a734;hp=9ea2c03a828d2ea6861b504c33512fa713d2cdea;hb=2c9711e213679e11bea1b0e86bb46af442b22ee0;hpb=1727b0714398fc4f318048d457a35ca58bc30b59

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 9ea2c03..d1654e5 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -658,7 +658,7 @@ void EffectChain::propagate_gamma_and_color_space()
 			continue;
 		}
 
-		ColorSpace color_space = node->incoming_links[0]->output_color_space;
+		Colorspace color_space = node->incoming_links[0]->output_color_space;
 		GammaCurve gamma_curve = node->incoming_links[0]->output_gamma_curve;
 		for (unsigned j = 1; j < node->incoming_links.size(); ++j) {
 			if (node->incoming_links[j]->output_color_space != color_space) {
@@ -671,7 +671,7 @@ void EffectChain::propagate_gamma_and_color_space()
 
 		// The conversion effects already have their outputs set correctly,
 		// so leave them alone.
-		if (node->effect->effect_type_id() != "ColorSpaceConversionEffect") {
+		if (node->effect->effect_type_id() != "ColorspaceConversionEffect") {
 			node->output_color_space = color_space;
 		}		
 		if (node->effect->effect_type_id() != "GammaCompressionEffect" &&
@@ -725,7 +725,7 @@ void EffectChain::fix_internal_color_spaces()
 				if (input->output_color_space == COLORSPACE_sRGB) {
 					continue;
 				}
-				Node *conversion = add_node(new ColorSpaceConversionEffect());
+				Node *conversion = add_node(new ColorspaceConversionEffect());
 				conversion->effect->set_int("source_space", input->output_color_space);
 				conversion->effect->set_int("destination_space", COLORSPACE_sRGB);
 				conversion->output_color_space = COLORSPACE_sRGB;
@@ -759,11 +759,12 @@ void EffectChain::fix_output_color_space()
 {
 	Node *output = find_output_node();
 	if (output->output_color_space != output_format.color_space) {
-		Node *conversion = add_node(new ColorSpaceConversionEffect());
+		Node *conversion = add_node(new ColorspaceConversionEffect());
 		conversion->effect->set_int("source_space", output->output_color_space);
 		conversion->effect->set_int("destination_space", output_format.color_space);
 		conversion->output_color_space = output_format.color_space;
 		connect_nodes(output, conversion);
+		propagate_gamma_and_color_space();
 	}
 }