Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17096
Modified Files:
ufraw_preview.c ufraw_ufraw.c
Log Message:
Save image defaults for image-chooser (bug ID: 2889697).
Clean pixbuf before first display.
free uf->conf in ufraw_close(), hopefully not breaking anything.
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- ufraw_ufraw.c 31 Oct 2009 01:59:19 -0000 1.203
+++ ufraw_ufraw.c 31 Oct 2009 05:18:37 -0000 1.204
@@ -651,8 +651,6 @@
dcraw_close(uf->raw);
g_free(uf->unzippedBuf);
g_free(uf->raw);
- /* We cannot free uf->conf since it might be accessed after the close */
-// g_free(uf->conf);
g_free(uf->inputExifBuf);
g_free(uf->outputExifBuf);
int i;
@@ -666,6 +664,7 @@
ufraw_close(uf->conf->darkframe);
g_free(uf->conf->darkframe);
}
+ g_free(uf->conf);
ufraw_message_reset(uf);
ufraw_message(UFRAW_CLEAN, NULL);
}
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- ufraw_preview.c 31 Oct 2009 01:59:19 -0000 1.293
+++ ufraw_preview.c 31 Oct 2009 05:18:37 -0000 1.294
@@ -5500,6 +5500,7 @@
// Allocate the preview pixbuf
data->PreviewPixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
preview_width, preview_height);
+ gdk_pixbuf_fill(data->PreviewPixbuf, 0);
gtk_image_view_set_pixbuf(GTK_IMAGE_VIEW(data->PreviewWidget),
data->PreviewPixbuf, FALSE);
g_object_unref(data->PreviewPixbuf);
@@ -5590,12 +5591,16 @@
/* Save configuration from CFG, but not the output filename. */
strcpy(CFG->outputFilename, "");
conf_save(CFG, NULL, NULL);
+ conf_copy_image(RC, CFG);
+ conf_copy_save(RC, CFG);
/* If save 'only this once' was chosen, then so be it */
} else if ( CFG->saveConfiguration==apply_state ) {
CFG->saveConfiguration = disabled_state;
/* Save configuration from CFG, but not the output filename. */
strcpy(CFG->outputFilename, "");
conf_save(CFG, NULL, NULL);
+ conf_copy_image(RC, CFG);
+ conf_copy_save(RC, CFG);
} else if ( CFG->saveConfiguration==disabled_state ) {
/* If save 'never again' was set in this session, we still
* need to save this setting */
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
