[Rawstudio-commit] r2737 - trunk/src

[Anders Brander]

Author: abrander
Date: 2009-11-09 04:04:41 +0100 (Mon, 09 Nov 2009)
New Revision: 2737

Modified:
   trunk/src/rs-batch.c
Log:
Reverting revision 2735 and applied proper fix.

Modified: trunk/src/rs-batch.c
===================================================================
--- trunk/src/rs-batch.c	2009-11-09 00:03:25 UTC (rev 2736)
+++ trunk/src/rs-batch.c	2009-11-09 03:04:41 UTC (rev 2737)
@@ -520,8 +520,8 @@
 				"rectangle", photo->crop,
 				"settings", photo->settings[setting_id],
 				"bounding-box", TRUE,
-				"width", queue->width,
-				"height", queue->height,
+				"width", 250,
+				"height", 250,
 				NULL);
 
 			/* Render preview image */
@@ -542,6 +542,8 @@
 				gtk_main_iteration();
 			g_free(basename);
 
+			width = 65535;
+			height = 65535;
 			/* Calculate new size */
 			switch (queue->size_lock)
 			{
@@ -552,21 +554,16 @@
 					break;
 				case LOCK_WIDTH:
 					width = queue->width;
-					scale = ((gdouble) width) / rs_filter_get_width(fcrop);
-					height = (gint) (scale * ((gdouble) rs_filter_get_height(fcrop)));
 					break;
 				case LOCK_HEIGHT:
 					height = queue->height;
-					scale = ((gdouble) height) / rs_filter_get_height(fcrop);
-					width = (gint) (scale * ((gdouble) rs_filter_get_width(fcrop)));
 					break;
 				case LOCK_BOUNDING_BOX:
-					width = rs_filter_get_width(fcrop);
-					height = rs_filter_get_height(fcrop);
-					rs_constrain_to_bounding_box(queue->width, queue->height, &width, &height);
+					width = queue->width;
+					height = queue->height;
 					break;
 			}
-			g_object_set(fend,
+			rs_filter_set_recursive(fend,
 				"width", width,
 				"height", height,
 				NULL);