[Rawstudio-commit] r4366 - in branches/4175-enfuse: librawstudio src

[Anders Kvist]

Author: akv
Date: 2013-04-26 22:46:21 +0200 (Fri, 26 Apr 2013)
New Revision: 4366

Modified:
   branches/4175-enfuse/librawstudio/conf_interface.h
   branches/4175-enfuse/src/rs-enfuse.c
Log:
Added 'extend' as an option for enfusing and setting it to false when using 
focus stacking.

Modified: branches/4175-enfuse/librawstudio/conf_interface.h
===================================================================
--- branches/4175-enfuse/librawstudio/conf_interface.h  2013-04-25 21:02:44 UTC 
(rev 4365)
+++ branches/4175-enfuse/librawstudio/conf_interface.h  2013-04-26 20:46:21 UTC 
(rev 4366)
@@ -76,6 +76,7 @@
 #define CONF_PICASA_CLIENT_ALBUM_ID "picasa_client_album_id"
 #define CONF_ENFUSE_METHOD "conf_enfuse_method"
 #define CONF_ENFUSE_ALIGN_IMAGES "conf_enfuse_align_images"
+#define CONF_ENFUSE_EXTEND "conf_enfuse_extend"
 
 #define DEFAULT_CONF_EXPORT_FILENAME "%f_%2c"
 #define DEFAULT_CONF_BATCH_DIRECTORY "batch_exports/"
@@ -109,6 +110,7 @@
 #define DEFAULT_CONF_MAIN_WINDOW_MAXIMIZED FALSE
 #define DEFAULT_CONF_ENFUSE_METHOD 0
 #define DEFAULT_CONF_ENFUSE_ALIGN_IMAGES TRUE
+#define DEFAULT_CONF_ENFUSE_EXTEND TRUE
 
 /* get the last working directory from gconf */
 void rs_set_last_working_directory(const char *lwd);

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2013-04-25 21:02:44 UTC (rev 
4365)
+++ branches/4175-enfuse/src/rs-enfuse.c        2013-04-26 20:46:21 UTC (rev 
4366)
@@ -288,7 +288,6 @@
   GString *fullpath = NULL;
   gchar *align_options = NULL;
   GString *enfuse_options = g_string_new("");
-  gboolean extend = TRUE;
   gint extend_num = 1;
   gfloat extend_step = 2.0;
   gint boundingbox = 0;
@@ -296,6 +295,9 @@
   gboolean align = DEFAULT_CONF_ENFUSE_ALIGN_IMAGES;
   rs_conf_get_boolean_with_default(CONF_ENFUSE_ALIGN_IMAGES, &align, 
DEFAULT_CONF_ENFUSE_ALIGN_IMAGES);
 
+  gboolean extend = DEFAULT_CONF_ENFUSE_EXTEND;
+  rs_conf_get_boolean_with_default(CONF_ENFUSE_EXTEND, &extend, 
DEFAULT_CONF_ENFUSE_EXTEND);
+
   gint method = 0;
   if (!rs_conf_get_integer(CONF_ENFUSE_METHOD, &method))
     method = DEFAULT_CONF_ENFUSE_METHOD;
@@ -305,6 +307,7 @@
     method_options = g_strdup(ENFUSE_OPTIONS_EXPOSURE_BLENDING);
   } else if (method == ENFUSE_METHOD_FOCUS_STACKING_ID) {
     method_options = g_strdup(ENFUSE_OPTIONS_FOCUS_STACKING);
+    extend = FALSE;
   }
 
   enfuse_options = g_string_append(enfuse_options, ENFUSE_OPTIONS);


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit