[Rawstudio-commit] r4211 - in branches/4175-enfuse: plugins/resample src

[Anders Kvist]

Author: akv
Date: 2012-04-29 22:37:29 +0200 (Sun, 29 Apr 2012)
New Revision: 4211

Modified:
   branches/4175-enfuse/plugins/resample/resample.c
   branches/4175-enfuse/src/rs-enfuse.c
Log:
Setting size -1 for full size.

Modified: branches/4175-enfuse/plugins/resample/resample.c
===================================================================
--- branches/4175-enfuse/plugins/resample/resample.c    2012-04-29 10:22:17 UTC 
(rev 4210)
+++ branches/4175-enfuse/plugins/resample/resample.c    2012-04-29 20:37:29 UTC 
(rev 4211)
@@ -114,12 +114,12 @@
        g_object_class_install_property(object_class,
                PROP_WIDTH, g_param_spec_int(
                        "width", "width", "The width of the scaled image",
-                       6, 65535, 100, G_PARAM_READWRITE)
+                       -1, 65535, 100, G_PARAM_READWRITE)
        );
        g_object_class_install_property(object_class,
                PROP_HEIGHT, g_param_spec_int(
                        "height", "height", "The height of the scaled image",
-                       6, 65535, 100, G_PARAM_READWRITE)
+                       -1, 65535, 100, G_PARAM_READWRITE)
        );
        g_object_class_install_property(object_class,
                PROP_BOUNDING_BOX, g_param_spec_boolean(

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2012-04-29 10:22:17 UTC (rev 
4210)
+++ branches/4175-enfuse/src/rs-enfuse.c        2012-04-29 20:37:29 UTC (rev 
4211)
@@ -84,19 +84,13 @@
       rs_photo_set_exposure(photo, 0, exposure);
       rs_photo_apply_to_filters(photo, filters, snapshot);
       
-      if (boundingbox > 0)
-       rs_filter_set_recursive(filter,
-                               "image", photo->input_response,
-                               "filename", photo->filename,
-                               "bounding-box", TRUE,
-                               "width", boundingbox,
-                               "height", boundingbox,
-                               NULL);
-      else
-       rs_filter_set_recursive(filter,
-                               "image", photo->input_response,
-                               "filename", photo->filename,
-                               NULL);
+      rs_filter_set_recursive(filter,
+                             "image", photo->input_response,
+                             "filename", photo->filename,
+                             "bounding-box", TRUE,
+                             "width", boundingbox,
+                             "height", boundingbox,
+                             NULL);
 
       if (g_object_class_find_property(G_OBJECT_GET_CLASS(output), "filename"))
        g_object_set(output, "filename", outputname, NULL);
@@ -268,7 +262,7 @@
   gchar *align_options = NULL;
   gchar *enfuse_options = g_strdup("-d 16");
   gboolean extend = TRUE;
-  gint boundingbox = 500;
+  gint boundingbox = -1;
 
   if (num_selected == 1)
     extend = TRUE;
@@ -290,7 +284,7 @@
       fullpath = g_string_append(fullpath, ".tif");
     }
 
-  GList *exported_names = export_images(rs, files, extend, 2, 1.0, 2, 1.0, 
boundingbox);
+  GList *exported_names = export_images(rs, files, extend, 0, 1.0, 0, 1.0, 
boundingbox);
   GList *aligned_names = NULL;
   if (has_align_image_stack() && num_selected > 1)
       aligned_names = align_images(exported_names, align_options);


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