Author: abrander
Date: 2009-08-05 19:39:00 +0200 (Wed, 05 Aug 2009)
New Revision: 2608
Modified:
trunk/src/application.c
trunk/src/rs-batch.c
trunk/src/rs-save-dialog.c
Log:
Restored EXIF-saving for all save-paths. I think.
Modified: trunk/src/application.c
===================================================================
--- trunk/src/application.c 2009-08-05 17:38:15 UTC (rev 2607)
+++ trunk/src/application.c 2009-08-05 17:39:00 UTC (rev 2608)
@@ -134,7 +134,7 @@
RSFilter *fbasic_render = rs_filter_new("RSBasicRender", fdenoise);
RSFilter *fend = fbasic_render;
- g_object_set(finput, "image", photo->input, NULL);
+ g_object_set(finput, "image", photo->input, "filename",
photo->filename, NULL);
g_object_set(frotate, "angle", photo->angle, "orientation",
photo->orientation, NULL);
g_object_set(fcrop, "rectangle", photo->crop, NULL);
actual_scale = ((gdouble) width / (gdouble)
rs_filter_get_width(finput));
@@ -179,20 +179,6 @@
/* Set the exported flag */
rs_store_set_flags(NULL, photo->filename, NULL, NULL, &photo->exported);
- /* Save exif for JPEG files */
-#if 0
- RS_EXIF_DATA *exif;
- /* FIXME: Move this to plugin */
- if (g_str_equal(RS_OUTPUT_NAME(output), "RSJpeg"))
- {
- exif = rs_exif_load_from_file(photo->filename);
- if (exif)
- {
- rs_exif_add_to_file(exif, filename);
- rs_exif_free(exif);
- }
- }
-#endif /* 0 */
g_object_unref(finput);
g_object_unref(fdemosaic);
g_object_unref(frotate);
@@ -230,6 +216,7 @@
/* We need this for 100% zoom */
g_object_set(cache, "ignore-roi", TRUE, NULL);
+ rs_filter_set_enabled(rs->filter_lensfun, FALSE);
rs->filter_end = cache;
filename = rs_conf_get_cms_profile(CMS_PROFILE_INPUT);
Modified: trunk/src/rs-batch.c
===================================================================
--- trunk/src/rs-batch.c 2009-08-05 17:38:15 UTC (rev 2607)
+++ trunk/src/rs-batch.c 2009-08-05 17:39:00 UTC (rev 2608)
@@ -510,7 +510,7 @@
g_string_append(filename,
rs_output_get_extension(queue->output));
parsed_filename = filename_parse(filename->str,
filename_in, setting_id);
- g_object_set(finput, "image", photo->input, NULL);
+ g_object_set(finput, "image", photo->input, "filename",
photo->filename, NULL);
g_object_set(frotate, "angle", photo->angle,
"orientation", photo->orientation, NULL);
g_object_set(fcrop, "rectangle", photo->crop, NULL);
g_object_set(fbasic_render, "settings",
photo->settings[setting_id], NULL);
Modified: trunk/src/rs-save-dialog.c
===================================================================
--- trunk/src/rs-save-dialog.c 2009-08-05 17:38:15 UTC (rev 2607)
+++ trunk/src/rs-save-dialog.c 2009-08-05 17:39:00 UTC (rev 2608)
@@ -201,6 +201,8 @@
g_object_set(dialog->filter_rotate, "angle", photo->angle,
"orientation", photo->orientation, NULL);
g_object_set(dialog->filter_crop, "rectangle", photo->crop, NULL);
+ g_object_set(dialog->filter_input, "filename", photo->filename, NULL);
+
if (dialog->photo)
g_object_unref(dialog->photo);
dialog->photo = g_object_ref(photo);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
