Author: post
Date: 2009-12-13 11:55:17 +0100 (Sun, 13 Dec 2009)
New Revision: 2790
Modified:
trunk/plugins/dcp/dcp.c
Log:
DCP: Allow for only one color matrix to be present.
Modified: trunk/plugins/dcp/dcp.c
===================================================================
--- trunk/plugins/dcp/dcp.c 2009-12-12 14:49:52 UTC (rev 2789)
+++ trunk/plugins/dcp/dcp.c 2009-12-13 10:55:17 UTC (rev 2790)
@@ -1714,10 +1714,15 @@
alpha = (invT - (1.0 / dcp->temp2)) / ((1.0 / dcp->temp1) -
(1.0 / dcp->temp2));
}
+ /* Interpolate if more than one color matrix */
RS_MATRIX3 color_matrix;
+ if(dcp->has_color_matrix1 && dcp->has_color_matrix2)
+ matrix3_interpolate(&dcp->color_matrix1, &dcp->color_matrix2,
alpha, &color_matrix);
+ else if (dcp->has_color_matrix1)
+ color_matrix = dcp->color_matrix1;
+ else if (dcp->has_color_matrix2)
+ color_matrix = dcp->color_matrix2;
- matrix3_interpolate(&dcp->color_matrix1, &dcp->color_matrix2, alpha,
&color_matrix);
-
if (forward_matrix)
{
if (dcp->has_forward_matrix1 && dcp->has_forward_matrix2)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
