From 4ee641a361f5e24ed8571af886f7adccfb5f21e2 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 22 Jun 2000 20:44:26 +0000 Subject: [PATCH] Stupid brain fart with the duplicate parameter logic -Yosh --- ChangeLog | 7 +++++++ libgimp/gimpgradientselect_pdb.c | 6 +++--- libgimp/gimptools_pdb.c | 36 ++++++++++++++++---------------- tools/pdbgen/lib.pl | 1 - 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7bc15cc2b..55a99afd21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 22 13:43:10 PDT 2000 Manish Singh + + * tools/pdbgen/lib.pl + * libgimp/gimpgradientselect_pdb.c + * libgimp/gimptools_pdb.c: stupid brain fart with the duplicate + parameter logic + Thu Jun 22 13:02:01 PDT 2000 Manish Singh * tools/pdbgen/lib.pl diff --git a/libgimp/gimpgradientselect_pdb.c b/libgimp/gimpgradientselect_pdb.c index f3cd281206..457f35f214 100644 --- a/libgimp/gimpgradientselect_pdb.c +++ b/libgimp/gimpgradientselect_pdb.c @@ -81,7 +81,7 @@ _gimp_gradients_get_gradient_data (gchar *name, { GParam *return_vals; gint nreturn_vals; - gchar *name = NULL; + gchar *ret_name = NULL; return_vals = gimp_run_procedure ("gimp_gradients_get_gradient_data", &nreturn_vals, @@ -93,7 +93,7 @@ _gimp_gradients_get_gradient_data (gchar *name, if (return_vals[0].data.d_status == STATUS_SUCCESS) { - name = g_strdup (return_vals[1].data.d_string); + ret_name = g_strdup (return_vals[1].data.d_string); *width = return_vals[2].data.d_int32; *grad_data = g_new (gdouble, *width); memcpy (*grad_data, return_vals[3].data.d_floatarray, @@ -102,5 +102,5 @@ _gimp_gradients_get_gradient_data (gchar *name, gimp_destroy_params (return_vals, nreturn_vals); - return name; + return ret_name; } diff --git a/libgimp/gimptools_pdb.c b/libgimp/gimptools_pdb.c index 600b1c1751..45d75c0d47 100644 --- a/libgimp/gimptools_pdb.c +++ b/libgimp/gimptools_pdb.c @@ -426,7 +426,7 @@ gimp_flip (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_flip", &nreturn_vals, @@ -435,11 +435,11 @@ gimp_flip (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } void @@ -572,7 +572,7 @@ gimp_perspective (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_perspective", &nreturn_vals, @@ -589,11 +589,11 @@ gimp_perspective (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } void @@ -631,7 +631,7 @@ gimp_rotate (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_rotate", &nreturn_vals, @@ -641,11 +641,11 @@ gimp_rotate (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } gint32 @@ -658,7 +658,7 @@ gimp_scale (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_scale", &nreturn_vals, @@ -671,11 +671,11 @@ gimp_scale (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } gint32 @@ -686,7 +686,7 @@ gimp_shear (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_shear", &nreturn_vals, @@ -697,11 +697,11 @@ gimp_shear (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } void @@ -755,7 +755,7 @@ gimp_transform_2d (gint32 drawable_ID, { GParam *return_vals; gint nreturn_vals; - gint32 drawable_ID = -1; + gint32 ret_drawable_ID = -1; return_vals = gimp_run_procedure ("gimp_transform_2d", &nreturn_vals, @@ -771,9 +771,9 @@ gimp_transform_2d (gint32 drawable_ID, PARAM_END); if (return_vals[0].data.d_status == STATUS_SUCCESS) - drawable_ID = return_vals[1].data.d_drawable; + ret_drawable_ID = return_vals[1].data.d_drawable; gimp_destroy_params (return_vals, nreturn_vals); - return drawable_ID; + return ret_drawable_ID; } diff --git a/tools/pdbgen/lib.pl b/tools/pdbgen/lib.pl index a3483d4d8e..dca225f5b1 100644 --- a/tools/pdbgen/lib.pl +++ b/tools/pdbgen/lib.pl @@ -171,7 +171,6 @@ CODE $_->{libname} = exists $usednames{$_->{name}} ? "ret_$_->{name}" : $_->{name}; - $_->{libname} = $_->{name} if exists $_->{retval}; if (exists $_->{num}) { if (!exists $_->{no_lib}) {