Author: post
Date: 2010-01-04 19:51:17 +0100 (Mon, 04 Jan 2010)
New Revision: 2970
Modified:
branches/rawstudio-ng-color/src/rs-preview-widget.c
Log:
Switch dcp and denoise filters to get consistent colorspace for denoising.
Adjust cache positions. Send WB to dcp filter after switching profile.
Modified: branches/rawstudio-ng-color/src/rs-preview-widget.c
===================================================================
--- branches/rawstudio-ng-color/src/rs-preview-widget.c 2010-01-04 18:18:39 UTC
(rev 2969)
+++ branches/rawstudio-ng-color/src/rs-preview-widget.c 2010-01-04 18:51:17 UTC
(rev 2970)
@@ -338,15 +338,15 @@
for(i=0;i<MAX_VIEWS;i++)
{
preview->filter_resample[i] = rs_filter_new("RSResample", NULL);
- preview->filter_cache1[i] = rs_filter_new("RSCache",
preview->filter_resample[i]);
- preview->filter_denoise[i] = rs_filter_new("RSDenoise",
preview->filter_cache1[i]);
- preview->filter_cache2[i] = rs_filter_new("RSCache",
preview->filter_denoise[i]);
- preview->filter_transform_input[i] =
rs_filter_new("RSColorspaceTransform", preview->filter_cache2[i]);
- preview->filter_dcp[i] = rs_filter_new("RSDcp",
preview->filter_transform_input[i]);
- preview->filter_transform_display[i] =
rs_filter_new("RSColorspaceTransform", preview->filter_dcp[i]);
- preview->filter_mask[i] = rs_filter_new("RSExposureMask",
preview->filter_transform_display[i]);
- preview->filter_cache3[i] = rs_filter_new("RSCache",
preview->filter_mask[i]);
- preview->filter_end[i] = preview->filter_cache3[i];
+ preview->filter_transform_input[i] =
rs_filter_new("RSColorspaceTransform", preview->filter_resample[i]);
+ preview->filter_cache1[i] = rs_filter_new("RSCache",
preview->filter_transform_input[i]);
+ preview->filter_dcp[i] = rs_filter_new("RSDcp",
preview->filter_cache1[i]);
+ preview->filter_cache2[i] = rs_filter_new("RSCache",
preview->filter_dcp[i]);
+ preview->filter_denoise[i] = rs_filter_new("RSDenoise",
preview->filter_cache2[i]);
+ preview->filter_transform_display[i] =
rs_filter_new("RSColorspaceTransform", preview->filter_denoise[i]);
+ preview->filter_cache3[i] = rs_filter_new("RSCache",
preview->filter_transform_display[i]);
+ preview->filter_mask[i] = rs_filter_new("RSExposureMask",
preview->filter_cache3[i]);
+ preview->filter_end[i] = preview->filter_mask[i];
g_signal_connect(preview->filter_end[i], "changed",
G_CALLBACK(filter_changed), preview);
rs_filter_set_recursive(preview->filter_end[i], "bounding-box",
TRUE, NULL);
@@ -2226,7 +2226,10 @@
if (photo == preview->photo)
{
for(view=0;view<MAX_VIEWS;view++)
- g_object_set(preview->filter_dcp[view], "profile", dcp, NULL);
+ {
+ g_object_set(preview->filter_dcp[view], "profile", dcp,
NULL);
+ rs_filter_set_recursive(preview->filter_end[view],
"settings", preview->photo->settings[preview->snapshot[view]], NULL);
+ }
}
}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
