Author: post
Date: 2012-02-19 14:10:31 +0100 (Sun, 19 Feb 2012)
New Revision: 4152
Modified:
trunk/src/application.c
trunk/src/gtk-interface.c
trunk/src/rs-preview-widget.c
Log:
Don't intermediately display old image with new settings.
Modified: trunk/src/application.c
===================================================================
--- trunk/src/application.c 2012-02-18 17:57:23 UTC (rev 4151)
+++ trunk/src/application.c 2012-02-19 13:10:31 UTC (rev 4152)
@@ -72,7 +72,6 @@
{
g_assert(rs != NULL);
- rs_preview_widget_lock_renderer(RS_PREVIEW_WIDGET(rs->preview));
/* Unref old photo if any */
if (rs->photo)
g_object_unref(rs->photo);
@@ -93,7 +92,6 @@
g_signal_connect(G_OBJECT(rs->photo), "spatial-changed",
G_CALLBACK(photo_spatial_changed), rs);
g_signal_connect(G_OBJECT(rs->photo), "profile-changed",
G_CALLBACK(photo_profile_changed), rs);
}
- rs_preview_widget_unlock_renderer(RS_PREVIEW_WIDGET(rs->preview));
}
static void
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2012-02-18 17:57:23 UTC (rev 4151)
+++ trunk/src/gtk-interface.c 2012-02-19 13:10:31 UTC (rev 4152)
@@ -244,6 +244,7 @@
set_photo_info_label(photo);
+ rs_preview_widget_lock_renderer(RS_PREVIEW_WIDGET(rs->preview));
rs_set_photo(rs, photo);
/* We need check if we should calculate and set auto wb here because
the photo needs to be loaded for filterchain to work */
@@ -258,6 +259,8 @@
/* Set photo in preview-widget */
rs_preview_widget_set_photo(RS_PREVIEW_WIDGET(rs->preview), photo);
rs->photo->proposed_crop = NULL;
+ rs_preview_widget_unlock_renderer(RS_PREVIEW_WIDGET(rs->preview));
+ rs_preview_widget_update(RS_PREVIEW_WIDGET(rs->preview), TRUE);
GTK_CATCHUP();
if (rs->photo && NULL==rs->photo->crop && rs->photo->proposed_crop)
rs_photo_set_crop(rs->photo, rs->photo->proposed_crop);
Modified: trunk/src/rs-preview-widget.c
===================================================================
--- trunk/src/rs-preview-widget.c 2012-02-18 17:57:23 UTC (rev 4151)
+++ trunk/src/rs-preview-widget.c 2012-02-19 13:10:31 UTC (rev 4152)
@@ -728,7 +728,6 @@
photo->thumbnail_filter = preview->navigator_filter_end;
g_signal_connect(G_OBJECT(preview->photo), "lens-changed",
G_CALLBACK(lens_changed), preview);
g_signal_connect(G_OBJECT(preview->photo), "profile-changed",
G_CALLBACK(profile_changed), preview);
- rs_preview_widget_update(preview, TRUE);
}
}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
