has only one return value if called as recompose. Fixes the trigger for

2006-08-15  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/compose.c: has only one return value if called
	as recompose. Fixes the trigger for bug #350226.
This commit is contained in:
Sven Neumann 2006-08-15 06:26:27 +00:00 committed by Sven Neumann
parent 2c47055043
commit 307f75f42c
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2006-08-15 Sven Neumann <sven@gimp.org>
* plug-ins/common/compose.c: has only one return value if called
as recompose. Fixes the trigger for bug #350226.
2006-08-14 Michael Natterer <mitch@gimp.org>
Fixed rounding and double vs. integer inconsistency when dealing

View File

@ -444,7 +444,7 @@ run (const gchar *name,
run_mode = param[0].data.d_int32;
compose_by_drawable = (strcmp (name, DRAWABLE_COMPOSE_PROC) == 0);
*nreturn_vals = 2;
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
@ -520,6 +520,7 @@ run (const gchar *name,
(gint) param[1].data.d_int32);
return;
}
drawable_ID = layer_list[0];
g_free (layer_list);
}
@ -562,6 +563,7 @@ run (const gchar *name,
status = GIMP_PDB_CALLING_ERROR;
break;
}
composevals.inputs[i].is_ID = FALSE;
composevals.inputs[i].comp.val = param[7 + i].data.d_int8;
}
@ -609,6 +611,7 @@ run (const gchar *name,
{
gimp_image_undo_enable (image_ID);
gimp_image_clean_all (image_ID);
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_display_new (image_ID);
}
@ -619,6 +622,8 @@ run (const gchar *name,
gimp_set_data (name, &composevals, sizeof (ComposeVals));
}
*nreturn_vals = composevals.do_recompose ? 1 : 2;
values[0].data.d_status = status;
}