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

[Anders Kvist]

Author: akv
Date: 2012-04-29 11:50:42 +0200 (Sun, 29 Apr 2012)
New Revision: 4209

Modified:
   branches/4175-enfuse/src/rs-actions.c
   branches/4175-enfuse/src/rs-enfuse.c
   branches/4175-enfuse/src/rs-enfuse.h
Log:
More cleanup.

Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c       2012-04-29 08:38:25 UTC (rev 
4208)
+++ branches/4175-enfuse/src/rs-actions.c       2012-04-29 09:50:42 UTC (rev 
4209)
@@ -1421,7 +1421,7 @@
 {
   gboolean enfuse = TRUE;
   GList *selected_names = rs_store_get_selected_names(rs->store);
-  gchar *filename = rs_enfuse(selected_names);
+  gchar *filename = rs_enfuse(rs, selected_names);
   g_list_free(selected_names);
   rs_cache_save_flags(filename, NULL, NULL, &enfuse);
   rs_store_load_file(rs->store, filename);

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2012-04-29 08:38:25 UTC (rev 
4208)
+++ branches/4175-enfuse/src/rs-enfuse.c        2012-04-29 09:50:42 UTC (rev 
4209)
@@ -113,7 +113,7 @@
     return -1;
 }
 
-GList * export_images(GList *files, gboolean extend, gint dark, gfloat 
darkstep, gint bright, gfloat brightstep, gint boundingbox)
+GList * export_images(RS_BLOB *rs, GList *files, gboolean extend, gint dark, 
gfloat darkstep, gint bright, gfloat brightstep, gint boundingbox)
 {
   gint num_selected = g_list_length(files);
   gint i = 0;
@@ -124,15 +124,9 @@
   output_str = g_string_append(output_str, ".rawstudio-enfuse-");
   GString *output_unique = NULL;
 
-  RSFilter *finput = rs_filter_new("RSInputImage16", NULL);
-  RSFilter *fdemosaic = rs_filter_new("RSDemosaic", finput);
-  RSFilter *ffujirotate = rs_filter_new("RSFujiRotate", fdemosaic);
-  RSFilter *frotate = rs_filter_new("RSRotate", ffujirotate);
-  RSFilter *fcrop = rs_filter_new("RSCrop", frotate);
-  RSFilter *ftransform_input = rs_filter_new("RSColorspaceTransform", fcrop);
+  RSFilter *ftransform_input = rs_filter_new("RSColorspaceTransform", 
rs->filter_crop);
   RSFilter *fdcp= rs_filter_new("RSDcp", ftransform_input);
-  RSFilter *fcache = rs_filter_new("RSCache", fdcp);
-  RSFilter *fresample= rs_filter_new("RSResample", fcache);
+  RSFilter *fresample= rs_filter_new("RSResample", fdcp);
   RSFilter *fdenoise= rs_filter_new("RSDenoise", fresample);
   RSFilter *ftransform_display = rs_filter_new("RSColorspaceTransform", 
fdenoise);
   RSFilter *fend = ftransform_display;
@@ -210,6 +204,9 @@
        }
       g_free(brightest);
     }
+
+  /* FIXME: shouldn't 'files' be freed here? It breaks RSStore... */
+
   return exported_names;
 }
 
@@ -259,7 +256,7 @@
     }
 }
 
-gchar * rs_enfuse(GList *files)
+gchar * rs_enfuse(RS_BLOB *rs, GList *files)
 {
   gint num_selected = g_list_length(files);
   gint i;
@@ -292,7 +289,7 @@
       fullpath = g_string_append(fullpath, ".tif");
     }
 
-  GList *exported_names = export_images(files, extend, 2, 1.0, 2, 1.0, 
boundingbox);
+  GList *exported_names = export_images(rs, files, extend, 2, 1.0, 2, 1.0, 
boundingbox);
   GList *aligned_names = NULL;
   if (has_align_image_stack() && num_selected > 1)
       aligned_names = align_images(exported_names, align_options);

Modified: branches/4175-enfuse/src/rs-enfuse.h
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.h        2012-04-29 08:38:25 UTC (rev 
4208)
+++ branches/4175-enfuse/src/rs-enfuse.h        2012-04-29 09:50:42 UTC (rev 
4209)
@@ -22,7 +22,7 @@
 
 #include "application.h"
 
-extern gchar * rs_enfuse(GList *files);
+extern gchar * rs_enfuse(RS_BLOB *rs, GList *files);
 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