From 1c979b5784538dc3d45e6c5f1db243f365666ed6 Mon Sep 17 00:00:00 2001 From: "Eric L. Hernes" Date: Tue, 9 Dec 1997 01:29:39 +0000 Subject: [PATCH] emboss/emboss.c hot/hot.c nlfilt/nlfilt.c: fix `re-run with last args' to operate on the current image/drawable pat/pat.c: fix handling of pattern name when called non-interactively --- plug-ins/common/emboss.c | 3 +++ plug-ins/common/hot.c | 7 +++---- plug-ins/common/nlfilt.c | 6 ++---- plug-ins/common/pat.c | 2 ++ plug-ins/emboss/emboss.c | 3 +++ plug-ins/hot/hot.c | 7 +++---- plug-ins/nlfilt/nlfilt.c | 6 ++---- plug-ins/pat/pat.c | 2 ++ 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 6df2b9f1a7..97e1f9b42a 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -194,6 +194,9 @@ run(gchar *name, gint nparam, GParam *param, case RUN_WITH_LAST_VALS: gimp_get_data("plug_in_emboss", &args); + /* use this image and drawable, even with last args */ + args.img = param[1].data.d_image; + args.drw = param[2].data.d_drawable; if (pluginCore(&args)==-1) { rvals[0].data.d_status = STATUS_EXECUTION_ERROR; } diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 791e89d295..77e161b0c5 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -234,13 +234,14 @@ run(char *name, int nparam, GParam *param, gimp_get_data("plug_in_hot", &args); + args.image = param[1].data.d_image; + args.drawable = param[2].data.d_drawable; + rvals[0].type = PARAM_STATUS; rvals[0].data.d_status = STATUS_SUCCESS; switch (param[0].data.d_int32) { case RUN_INTERACTIVE: /* XXX: add code here for interactive running */ - args.image = param[1].data.d_image; - args.drawable = param[2].data.d_drawable; if(args.mode == -1) { args.mode = mode_ntsc; args.action = act_lredux; @@ -260,8 +261,6 @@ run(char *name, int nparam, GParam *param, rvals[0].data.d_status = STATUS_CALLING_ERROR; break; } - args.image = param[1].data.d_image; - args.drawable = param[2].data.d_drawable; args.mode = param[3].data.d_drawable; args.action = param[4].data.d_drawable; diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c index 683ebabf45..faa4d4a327 100644 --- a/plug-ins/common/nlfilt.c +++ b/plug-ins/common/nlfilt.c @@ -140,6 +140,8 @@ run(char *name, gint nparam, GParam *param, args.radius=-1.0; gimp_get_data("plug_in_nlfilt", &args); + args.img = param[1].data.d_image; + args.drw = param[2].data.d_drawable; rvals[0].type = PARAM_STATUS; rvals[0].data.d_status = STATUS_SUCCESS; @@ -147,8 +149,6 @@ run(char *name, gint nparam, GParam *param, GDrawable *drw; case RUN_INTERACTIVE: /* XXX: add code here for interactive running */ - args.img = param[1].data.d_image; - args.drw = param[2].data.d_drawable; if (args.radius == -1) { args.alpha = (gdouble)0.3; args.radius = (gdouble)0.3; @@ -171,8 +171,6 @@ run(char *name, gint nparam, GParam *param, rvals[0].data.d_status = STATUS_CALLING_ERROR; break; } - args.img = param[1].data.d_image; - args.drw = param[2].data.d_drawable; args.alpha = param[3].data.d_float; args.radius = param[4].data.d_float; args.filter = param[5].data.d_int32; diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index 41d168177a..35f73fa7da 100644 --- a/plug-ins/common/pat.c +++ b/plug-ins/common/pat.c @@ -152,6 +152,8 @@ run (char *name, case RUN_NONINTERACTIVE: if (nparams != 6) status = STATUS_CALLING_ERROR; + else + strcpy(description, param[5].data.d_string); case RUN_WITH_LAST_VALS: gimp_get_data ("file_pat_save", description); break; diff --git a/plug-ins/emboss/emboss.c b/plug-ins/emboss/emboss.c index 6df2b9f1a7..97e1f9b42a 100644 --- a/plug-ins/emboss/emboss.c +++ b/plug-ins/emboss/emboss.c @@ -194,6 +194,9 @@ run(gchar *name, gint nparam, GParam *param, case RUN_WITH_LAST_VALS: gimp_get_data("plug_in_emboss", &args); + /* use this image and drawable, even with last args */ + args.img = param[1].data.d_image; + args.drw = param[2].data.d_drawable; if (pluginCore(&args)==-1) { rvals[0].data.d_status = STATUS_EXECUTION_ERROR; } diff --git a/plug-ins/hot/hot.c b/plug-ins/hot/hot.c index 791e89d295..77e161b0c5 100644 --- a/plug-ins/hot/hot.c +++ b/plug-ins/hot/hot.c @@ -234,13 +234,14 @@ run(char *name, int nparam, GParam *param, gimp_get_data("plug_in_hot", &args); + args.image = param[1].data.d_image; + args.drawable = param[2].data.d_drawable; + rvals[0].type = PARAM_STATUS; rvals[0].data.d_status = STATUS_SUCCESS; switch (param[0].data.d_int32) { case RUN_INTERACTIVE: /* XXX: add code here for interactive running */ - args.image = param[1].data.d_image; - args.drawable = param[2].data.d_drawable; if(args.mode == -1) { args.mode = mode_ntsc; args.action = act_lredux; @@ -260,8 +261,6 @@ run(char *name, int nparam, GParam *param, rvals[0].data.d_status = STATUS_CALLING_ERROR; break; } - args.image = param[1].data.d_image; - args.drawable = param[2].data.d_drawable; args.mode = param[3].data.d_drawable; args.action = param[4].data.d_drawable; diff --git a/plug-ins/nlfilt/nlfilt.c b/plug-ins/nlfilt/nlfilt.c index 683ebabf45..faa4d4a327 100644 --- a/plug-ins/nlfilt/nlfilt.c +++ b/plug-ins/nlfilt/nlfilt.c @@ -140,6 +140,8 @@ run(char *name, gint nparam, GParam *param, args.radius=-1.0; gimp_get_data("plug_in_nlfilt", &args); + args.img = param[1].data.d_image; + args.drw = param[2].data.d_drawable; rvals[0].type = PARAM_STATUS; rvals[0].data.d_status = STATUS_SUCCESS; @@ -147,8 +149,6 @@ run(char *name, gint nparam, GParam *param, GDrawable *drw; case RUN_INTERACTIVE: /* XXX: add code here for interactive running */ - args.img = param[1].data.d_image; - args.drw = param[2].data.d_drawable; if (args.radius == -1) { args.alpha = (gdouble)0.3; args.radius = (gdouble)0.3; @@ -171,8 +171,6 @@ run(char *name, gint nparam, GParam *param, rvals[0].data.d_status = STATUS_CALLING_ERROR; break; } - args.img = param[1].data.d_image; - args.drw = param[2].data.d_drawable; args.alpha = param[3].data.d_float; args.radius = param[4].data.d_float; args.filter = param[5].data.d_int32; diff --git a/plug-ins/pat/pat.c b/plug-ins/pat/pat.c index 41d168177a..35f73fa7da 100644 --- a/plug-ins/pat/pat.c +++ b/plug-ins/pat/pat.c @@ -152,6 +152,8 @@ run (char *name, case RUN_NONINTERACTIVE: if (nparams != 6) status = STATUS_CALLING_ERROR; + else + strcpy(description, param[5].data.d_string); case RUN_WITH_LAST_VALS: gimp_get_data ("file_pat_save", description); break; -- GitLab