colorspace: fix gamut processing

sekrit-twc · sekrit-twc · commit 04076c121b4b · 2015-10-24T09:11:59.000-07:00
diff --git a/src/zimg/colorspace/operation.cpp b/src/zimg/colorspace/operation.cpp
@@ -43,7 +43,7 @@ std::unique_ptr<Operation> create_linear_to_gamma_operation(TransferCharacterist
 
 std::unique_ptr<Operation> create_gamut_operation(ColorPrimaries primaries_in, ColorPrimaries primaries_out, CPUClass cpu)
 {
-	return create_matrix_operation(gamut_rgb_to_xyz_matrix(primaries_in) * gamut_xyz_to_rgb_matrix(primaries_out), cpu);
+	return create_matrix_operation(gamut_xyz_to_rgb_matrix(primaries_out) * gamut_rgb_to_xyz_matrix(primaries_in), cpu);
 }
 
 } // namespace colorspace
diff --git a/test/colorspace/colorspace_test.cpp b/test/colorspace/colorspace_test.cpp
@@ -93,14 +93,14 @@ TEST(ColorspaceConversionTest, test_matrix_transfer_primaries)
 
 	const char *expected_sha1[][3] = {
 		{
-			"801cd3a68eec5bdac4b14e40de6f76724a0a48af",
-			"f40cf973dc5245610a6cf4cbd7640d0369a1ff97",
-			"b8deaf80e09777de4c3260850b0347a47f611040"
+			"4cd9db8fd2ded345aafffda2358cd6de9c763e00",
+			"2dd41a82f55933f35988ca5f2d57c09f8157d43a",
+			"2262468fb4840160c880dcaace12a44568e44246"
 		},
 		{
-			"ffc1ff3c7be80355c40cf2b7b105ffce9d0a23a6",
-			"7cb906b65f88d997c354bedfd80b37c1959d883d",
-			"2a1330b248efa25fc1acfc25c1fba733910ebff9"
+			"1e14ec2d359417837a6501c948ec110597535bb4",
+			"c564d33ae070a54e5f10baa262f6da6c8450ed80",
+			"e511d90a33b8e27ee96adfda987038cd4d540f8e"
 		}
 	};
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ std::unique_ptr<Operation> create_linear_to_gamma_operation(TransferCharacterist`
`43`	`43`
`44`	`44`	`std::unique_ptr<Operation> create_gamut_operation(ColorPrimaries primaries_in, ColorPrimaries primaries_out, CPUClass cpu)`
`45`	`45`	`{`
`46`		`- return create_matrix_operation(gamut_rgb_to_xyz_matrix(primaries_in) * gamut_xyz_to_rgb_matrix(primaries_out), cpu);`
	`46`	`+ return create_matrix_operation(gamut_xyz_to_rgb_matrix(primaries_out) * gamut_rgb_to_xyz_matrix(primaries_in), cpu);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`} // namespace colorspace`
Original file line number	Diff line number	Diff line change
`@@ -93,14 +93,14 @@ TEST(ColorspaceConversionTest, test_matrix_transfer_primaries)`
`93`	`93`
`94`	`94`	`const char *expected_sha1[][3] = {`
`95`	`95`	`{`
`96`		`- "801cd3a68eec5bdac4b14e40de6f76724a0a48af",`
`97`		`- "f40cf973dc5245610a6cf4cbd7640d0369a1ff97",`
`98`		`- "b8deaf80e09777de4c3260850b0347a47f611040"`
	`96`	`+ "4cd9db8fd2ded345aafffda2358cd6de9c763e00",`
	`97`	`+ "2dd41a82f55933f35988ca5f2d57c09f8157d43a",`
	`98`	`+ "2262468fb4840160c880dcaace12a44568e44246"`
`99`	`99`	`},`
`100`	`100`	`{`
`101`		`- "ffc1ff3c7be80355c40cf2b7b105ffce9d0a23a6",`
`102`		`- "7cb906b65f88d997c354bedfd80b37c1959d883d",`
`103`		`- "2a1330b248efa25fc1acfc25c1fba733910ebff9"`
	`101`	`+ "1e14ec2d359417837a6501c948ec110597535bb4",`
	`102`	`+ "c564d33ae070a54e5f10baa262f6da6c8450ed80",`
	`103`	`+ "e511d90a33b8e27ee96adfda987038cd4d540f8e"`
`104`	`104`	`}`
`105`	`105`	`};`
`106`	`106`