[gimp] plug-ins: use the newly added GET_FOO_ID() macros
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: use the newly added GET_FOO_ID() macros
- Date: Thu, 5 Sep 2019 11:25:06 +0000 (UTC)
commit 3a2f8d422a7c46269ed8db830b18e0ae00372b27
Author: Michael Natterer <mitch gimp org>
Date: Thu Sep 5 13:24:25 2019 +0200
plug-ins: use the newly added GET_FOO_ID() macros
plug-ins/common/depth-merge.c | 24 +++++++------------
plug-ins/common/sample-colorize.c | 28 ++++++++++-------------
plug-ins/common/warp.c | 43 ++++++++++++-----------------------
plug-ins/lighting/lighting-main.c | 9 ++------
plug-ins/map-object/map-object-main.c | 11 +++------
5 files changed, 40 insertions(+), 75 deletions(-)
---
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index 34a4db9ced..7b5427a19c 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -320,22 +320,14 @@ merge_run (GimpProcedure *procedure,
case GIMP_RUN_NONINTERACTIVE:
dm.params.result_id = gimp_item_get_id (GIMP_ITEM (drawable));
- drawable = GIMP_VALUES_GET_DRAWABLE (args, 0);
- dm.params.source1_id = gimp_item_get_id (GIMP_ITEM (drawable));
-
- drawable = GIMP_VALUES_GET_DRAWABLE (args, 1);
- dm.params.source2_id = gimp_item_get_id (GIMP_ITEM (drawable));
-
- drawable = GIMP_VALUES_GET_DRAWABLE (args, 2);
- dm.params.depthMap1_id = gimp_item_get_id (GIMP_ITEM (drawable));
-
- drawable = GIMP_VALUES_GET_DRAWABLE (args, 3);
- dm.params.depthMap2_id = gimp_item_get_id (GIMP_ITEM (drawable));
-
- dm.params.overlap = GIMP_VALUES_GET_DOUBLE (args, 4);
- dm.params.offset = GIMP_VALUES_GET_DOUBLE (args, 5);
- dm.params.scale1 = GIMP_VALUES_GET_DOUBLE (args, 6);
- dm.params.scale2 = GIMP_VALUES_GET_DOUBLE (args, 7);
+ dm.params.source1_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 0);
+ dm.params.source2_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 1);
+ dm.params.depthMap1_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 2);
+ dm.params.depthMap2_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 3);
+ dm.params.overlap = GIMP_VALUES_GET_DOUBLE (args, 4);
+ dm.params.offset = GIMP_VALUES_GET_DOUBLE (args, 5);
+ dm.params.scale1 = GIMP_VALUES_GET_DOUBLE (args, 6);
+ dm.params.scale2 = GIMP_VALUES_GET_DOUBLE (args, 7);
if (! DepthMerge_construct (&dm))
{
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index e620381e6d..d70b7ff7d1 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -449,8 +449,6 @@ colorize_run (GimpProcedure *procedure,
if (gimp_drawable_is_rgb (drawable) ||
gimp_drawable_is_gray (drawable))
{
- GimpDrawable *sample;
-
switch (run_mode)
{
case GIMP_RUN_INTERACTIVE:
@@ -461,18 +459,16 @@ colorize_run (GimpProcedure *procedure,
break;
case GIMP_RUN_NONINTERACTIVE:
- sample = GIMP_VALUES_GET_DRAWABLE (args, 0);
- g_values.sample_id = gimp_item_get_id (GIMP_ITEM (sample));
-
- g_values.hold_inten = GIMP_VALUES_GET_BOOLEAN (args, 1);
- g_values.orig_inten = GIMP_VALUES_GET_BOOLEAN (args, 2);
- g_values.rnd_subcolors = GIMP_VALUES_GET_BOOLEAN (args, 3);
- g_values.guess_missing = GIMP_VALUES_GET_BOOLEAN (args, 4);
- g_values.lvl_in_min = GIMP_VALUES_GET_INT (args, 5);
- g_values.lvl_in_max = GIMP_VALUES_GET_INT (args, 6);
- g_values.lvl_in_gamma = GIMP_VALUES_GET_DOUBLE (args, 7);
- g_values.lvl_out_min = GIMP_VALUES_GET_INT (args, 8);
- g_values.lvl_out_max = GIMP_VALUES_GET_INT (args, 9);
+ g_values.sample_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 0);
+ g_values.hold_inten = GIMP_VALUES_GET_BOOLEAN (args, 1);
+ g_values.orig_inten = GIMP_VALUES_GET_BOOLEAN (args, 2);
+ g_values.rnd_subcolors = GIMP_VALUES_GET_BOOLEAN (args, 3);
+ g_values.guess_missing = GIMP_VALUES_GET_BOOLEAN (args, 4);
+ g_values.lvl_in_min = GIMP_VALUES_GET_INT (args, 5);
+ g_values.lvl_in_max = GIMP_VALUES_GET_INT (args, 6);
+ g_values.lvl_in_gamma = GIMP_VALUES_GET_DOUBLE (args, 7);
+ g_values.lvl_out_min = GIMP_VALUES_GET_INT (args, 8);
+ g_values.lvl_out_max = GIMP_VALUES_GET_INT (args, 9);
if (main_colorize (MC_GET_SAMPLE_COLORS) >= 0)
{
@@ -806,6 +802,7 @@ refresh_dst_preview (GtkWidget *preview,
src_ptr += src_bpp;
}
}
+
gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview),
0, 0, PREVIEW_SIZE_X, PREVIEW_SIZE_Y,
GIMP_RGB_IMAGE,
@@ -842,8 +839,7 @@ update_pv (GtkWidget *preview,
gint dstep;
guchar alpha;
-
- if (!preview)
+ if (! preview)
return;
/* init gray pixel (if we are called without a sourceimage (gdwr == NULL) */
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index e764ad82d6..5aa2fe78fe 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -356,8 +356,7 @@ warp_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
- GimpDrawable *map;
- GimpRGB color;
+ GimpRGB color;
INIT_I18N ();
gegl_init (NULL, NULL);
@@ -385,32 +384,20 @@ warp_run (GimpProcedure *procedure,
break;
case GIMP_RUN_NONINTERACTIVE:
- dvals.amount = GIMP_VALUES_GET_DOUBLE (args, 0);
-
- map = GIMP_VALUES_GET_DRAWABLE (args, 1);
- dvals.warp_map_id = gimp_item_get_id (GIMP_ITEM (map));
-
- dvals.iter = GIMP_VALUES_GET_INT (args, 2);
- dvals.dither = GIMP_VALUES_GET_DOUBLE (args, 3);
- dvals.angle = GIMP_VALUES_GET_DOUBLE (args, 4);
- dvals.wrap_type = GIMP_VALUES_GET_INT (args, 5);
-
- map = GIMP_VALUES_GET_DRAWABLE (args, 6);
- dvals.mag_map_id = gimp_item_get_id (GIMP_ITEM (map));
-
- dvals.mag_use = GIMP_VALUES_GET_BOOLEAN (args, 7);
- dvals.substeps = GIMP_VALUES_GET_INT (args, 8);
-
- map = GIMP_VALUES_GET_DRAWABLE (args, 9);
- dvals.grad_map_id = gimp_item_get_id (GIMP_ITEM (map));
-
- dvals.grad_scale = GIMP_VALUES_GET_DOUBLE (args, 10);
-
- map = GIMP_VALUES_GET_DRAWABLE (args, 11);
- dvals.vector_map_id = gimp_item_get_id (GIMP_ITEM (map));
-
- dvals.vector_scale = GIMP_VALUES_GET_DOUBLE (args, 12);
- dvals.vector_angle = GIMP_VALUES_GET_DOUBLE (args, 13);
+ dvals.amount = GIMP_VALUES_GET_DOUBLE (args, 0);
+ dvals.warp_map_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 1);
+ dvals.iter = GIMP_VALUES_GET_INT (args, 2);
+ dvals.dither = GIMP_VALUES_GET_DOUBLE (args, 3);
+ dvals.angle = GIMP_VALUES_GET_DOUBLE (args, 4);
+ dvals.wrap_type = GIMP_VALUES_GET_INT (args, 5);
+ dvals.mag_map_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 6);
+ dvals.mag_use = GIMP_VALUES_GET_BOOLEAN (args, 7);
+ dvals.substeps = GIMP_VALUES_GET_INT (args, 8);
+ dvals.grad_map_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 9);
+ dvals.grad_scale = GIMP_VALUES_GET_DOUBLE (args, 10);
+ dvals.vector_map_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 11);
+ dvals.vector_scale = GIMP_VALUES_GET_DOUBLE (args, 12);
+ dvals.vector_angle = GIMP_VALUES_GET_DOUBLE (args, 13);
break;
case GIMP_RUN_WITH_LAST_VALS:
diff --git a/plug-ins/lighting/lighting-main.c b/plug-ins/lighting/lighting-main.c
index a67170b91e..a69a890bea 100644
--- a/plug-ins/lighting/lighting-main.c
+++ b/plug-ins/lighting/lighting-main.c
@@ -386,8 +386,6 @@ lighting_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
- GimpDrawable *map;
-
INIT_I18N ();
gegl_init (NULL, NULL);
@@ -424,11 +422,8 @@ lighting_run (GimpProcedure *procedure,
break;
case GIMP_RUN_NONINTERACTIVE:
- map = GIMP_VALUES_GET_DRAWABLE (args, 0);
- mapvals.bumpmap_id = gimp_item_get_id (GIMP_ITEM (map));
-
- map = GIMP_VALUES_GET_DRAWABLE (args, 1);
- mapvals.envmap_id = gimp_item_get_id (GIMP_ITEM (map));
+ mapvals.bumpmap_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 0);
+ mapvals.envmap_id = GIMP_VALUES_GET_DRAWABLE_ID (args, 1);
mapvals.bump_mapped = GIMP_VALUES_GET_BOOLEAN (args, 2);
mapvals.env_mapped = GIMP_VALUES_GET_BOOLEAN (args, 3);
mapvals.bumpmaptype = GIMP_VALUES_GET_INT (args, 4);
diff --git a/plug-ins/map-object/map-object-main.c b/plug-ins/map-object/map-object-main.c
index 270c01dcbd..1f33952cbd 100644
--- a/plug-ins/map-object/map-object-main.c
+++ b/plug-ins/map-object/map-object-main.c
@@ -475,8 +475,7 @@ map_run (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
- GimpDrawable *side;
- gint i;
+ gint i;
INIT_I18N ();
gegl_init (NULL, NULL);
@@ -562,16 +561,12 @@ map_run (GimpProcedure *procedure,
for (i = 0; i < 6; i++)
{
- side = GIMP_VALUES_GET_DRAWABLE (args, 38 + i);
-
- mapvals.boxmap_id[i] = gimp_item_get_id (GIMP_ITEM (side));
+ mapvals.boxmap_id[i] = GIMP_VALUES_GET_DRAWABLE_ID (args, 38 + i);
}
for (i = 0; i < 2; i++)
{
- side = GIMP_VALUES_GET_DRAWABLE (args, 44 + i);
-
- mapvals.cylindermap_id[i] = gimp_item_get_id (GIMP_ITEM (side));
+ mapvals.cylindermap_id[i] = GIMP_VALUES_GET_DRAWABLE_ID (args, 44 + i);
}
check_drawables (drawable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
