[Rawstudio-commit] r4369 - branches/4175-enfuse/src

[Anders Kvist]

Author: akv
Date: 2013-04-27 00:22:09 +0200 (Sat, 27 Apr 2013)
New Revision: 4369

Modified:
   branches/4175-enfuse/src/rs-actions.c
   branches/4175-enfuse/src/rs-enfuse.c
   branches/4175-enfuse/src/rs-enfuse.h
Log:
Moved boundbox to be a argument to rs_enfuse() and temporary hardcoded size to 
1000px

Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c       2013-04-26 22:10:06 UTC (rev 
4368)
+++ branches/4175-enfuse/src/rs-actions.c       2013-04-26 22:22:09 UTC (rev 
4369)
@@ -1533,7 +1533,7 @@
   GUI_CATCHUP();
 
   GList *thumbs = get_thumbnails_from_list(selected_names);
-  gchar *thumb = rs_enfuse(rs, thumbs, TRUE);
+  gchar *thumb = rs_enfuse(rs, thumbs, TRUE, 250);
 
   GtkWidget *dialog = NULL;
   dialog = gui_dialog_make_from_text(GTK_STOCK_DIALOG_QUESTION, _("Enfuse"), 
_("This might take quite some time and will lock up UI until finished..."));
@@ -1574,7 +1574,7 @@
     }
   gtk_widget_destroy(dialog);
 
-  gchar *filename = rs_enfuse(rs, selected_names, FALSE);
+  gchar *filename = rs_enfuse(rs, selected_names, FALSE, 1000);
   g_list_free(selected_names);
   rs_cache_save_flags(filename, &priority, NULL, &enfuse);
 

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2013-04-26 22:10:06 UTC (rev 
4368)
+++ branches/4175-enfuse/src/rs-enfuse.c        2013-04-26 22:22:09 UTC (rev 
4369)
@@ -281,7 +281,7 @@
     }
 }
 
-gchar * rs_enfuse(RS_BLOB *rs, GList *files, gboolean quick)
+gchar * rs_enfuse(RS_BLOB *rs, GList *files, gboolean quick, gint boundingbox)
 {
   gint num_selected = g_list_length(files);
   gint i;
@@ -293,7 +293,6 @@
   GString *enfuse_options = g_string_new("");
   gint extend_num = 1;
   gfloat extend_step = 2.0;
-  gint boundingbox = 0;
 
   gboolean align = DEFAULT_CONF_ENFUSE_ALIGN_IMAGES;
   rs_conf_get_boolean_with_default(CONF_ENFUSE_ALIGN_IMAGES, &align, 
DEFAULT_CONF_ENFUSE_ALIGN_IMAGES);

Modified: branches/4175-enfuse/src/rs-enfuse.h
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.h        2013-04-26 22:10:06 UTC (rev 
4368)
+++ branches/4175-enfuse/src/rs-enfuse.h        2013-04-26 22:22:09 UTC (rev 
4369)
@@ -32,7 +32,7 @@
 #define ENFUSE_OPTIONS_FOCUS_STACKING "--exposure-weight=0 
--saturation-weight=0 --contrast-weight=1 --hard-mask"
 
 
-extern gchar * rs_enfuse(RS_BLOB *rs, GList *files, gboolean quick);
+extern gchar * rs_enfuse(RS_BLOB *rs, GList *files, gboolean quick, gint 
boundingbox);
 extern gboolean rs_has_enfuse (gint major, gint minor);
 
 #endif /* RS_ENFUSE_H  */


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