From 88e0cc3155ecf7bb12bb2da3a434366867d778a5 Mon Sep 17 00:00:00 2001 From: Marc Lehmann Date: Sun, 24 Oct 1999 20:49:09 +0000 Subject: [PATCH] api change #2, fix #1 --- ChangeLog | 13 +++- app/color_cmds.c | 10 ++-- app/core/gimpdrawable.c | 2 +- app/core/gimpdrawable.h | 2 +- app/drawable.h | 2 +- app/drawable_cmds.c | 66 ++++++++++----------- app/gimpdrawable.c | 2 +- app/gimpdrawable.h | 2 +- docs/script-fu.tex | 2 +- libgimp/gimp.def | 2 +- libgimp/gimp.h | 2 +- libgimp/gimpdrawable.c | 4 +- libgimp/gimpdrawable_pdb.c | 4 +- plug-ins/AlienMap/AlienMap.c | 2 +- plug-ins/AlienMap2/AlienMap2.c | 2 +- plug-ins/FractalExplorer/FractalExplorer.c | 2 +- plug-ins/Lighting/lighting_main.c | 2 +- plug-ins/MapObject/mapobject_ui.c | 4 +- plug-ins/borderaverage/borderaverage.c | 2 +- plug-ins/common/autocrop.c | 2 +- plug-ins/common/autostretch_hsv.c | 2 +- plug-ins/common/blinds.c | 2 +- plug-ins/common/blur.c | 2 +- plug-ins/common/borderaverage.c | 2 +- plug-ins/common/bumpmap.c | 4 +- plug-ins/common/c_astretch.c | 2 +- plug-ins/common/checkerboard.c | 2 +- plug-ins/common/color_enhance.c | 2 +- plug-ins/common/convmatrix.c | 6 +- plug-ins/common/cubism.c | 2 +- plug-ins/common/curve_bend.c | 2 +- plug-ins/common/deinterlace.c | 2 +- plug-ins/common/depthmerge.c | 4 +- plug-ins/common/despeckle.c | 5 +- plug-ins/common/destripe.c | 2 +- plug-ins/common/diffraction.c | 2 +- plug-ins/common/edge.c | 4 +- plug-ins/common/engrave.c | 4 +- plug-ins/common/exchange.c | 2 +- plug-ins/common/flarefx.c | 2 +- plug-ins/common/fp.c | 2 +- plug-ins/common/fractaltrace.c | 2 +- plug-ins/common/gauss_iir.c | 2 +- plug-ins/common/gauss_rle.c | 2 +- plug-ins/common/glasstile.c | 2 +- plug-ins/common/gqbist.c | 2 +- plug-ins/common/gradmap.c | 6 +- plug-ins/common/grid.c | 2 +- plug-ins/common/illusion.c | 2 +- plug-ins/common/iwarp.c | 2 +- plug-ins/common/laplace.c | 2 +- plug-ins/common/lic.c | 4 +- plug-ins/common/mapcolor.c | 2 +- plug-ins/common/max_rgb.c | 2 +- plug-ins/common/mblur.c | 2 +- plug-ins/common/mosaic.c | 2 +- plug-ins/common/newsprint.c | 2 +- plug-ins/common/noisify.c | 2 +- plug-ins/common/normalize.c | 2 +- plug-ins/common/nova.c | 2 +- plug-ins/common/oilify.c | 4 +- plug-ins/common/papertile.c | 2 +- plug-ins/common/pixelize.c | 2 +- plug-ins/common/plasma.c | 2 +- plug-ins/common/polar.c | 2 +- plug-ins/common/randomize.c | 2 +- plug-ins/common/ripple.c | 2 +- plug-ins/common/rotators.c | 2 +- plug-ins/common/sample_colorize.c | 2 +- plug-ins/common/scatter_hsv.c | 2 +- plug-ins/common/sel_gauss.c | 2 +- plug-ins/common/semiflatten.c | 2 +- plug-ins/common/sharpen.c | 5 +- plug-ins/common/shift.c | 2 +- plug-ins/common/smooth_palette.c | 2 +- plug-ins/common/snoise.c | 2 +- plug-ins/common/sobel.c | 2 +- plug-ins/common/sparkle.c | 2 +- plug-ins/common/spread.c | 2 +- plug-ins/common/threshold_alpha.c | 4 +- plug-ins/common/tileit.c | 2 +- plug-ins/common/tiler.c | 2 +- plug-ins/common/video.c | 2 +- plug-ins/common/vinvert.c | 2 +- plug-ins/common/whirlpinch.c | 2 +- plug-ins/common/zealouscrop.c | 2 +- plug-ins/flame/flame.c | 2 +- plug-ins/fp/fp.c | 2 +- plug-ins/gfig/gfig.c | 2 +- plug-ins/gflare/gflare.c | 4 +- plug-ins/gimpressionist/brush.c | 2 +- plug-ins/gimpressionist/gimp.c | 2 +- plug-ins/ifscompose/ifscompose.c | 2 +- plug-ins/imagemap/imap_main.c | 2 +- plug-ins/maze/maze.c | 2 +- plug-ins/mosaic/mosaic.c | 2 +- plug-ins/pagecurl/pagecurl.c | 6 +- plug-ins/pygimp/gimpmodule.c | 4 +- plug-ins/rcm/rcm.c | 2 +- plug-ins/script-fu/scripts/crystal-logo.scm | 2 +- plug-ins/sinus/sinus.c | 2 +- plug-ins/struc/struc.c | 2 +- po/gimp.pot | 58 +++++++++--------- tools/pdbgen/pdb/color.pdb | 10 ++-- tools/pdbgen/pdb/drawable.pdb | 10 ++-- 105 files changed, 212 insertions(+), 195 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33fb869126..6ffbce4878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 24 16:49:13 CEST 1999 Marc Lehmann + + * tools/pdbgen/pdb/drawable.pdb, all calls: fixed some improperly + renamed pdb functions, most notably gimp_drawable_color. + Sun Oct 24 22:10:16 MEST 1999 Sven Neumann * app/channels_dialog.c @@ -197,6 +202,7 @@ Thu Oct 19 05:30:11 BST 1999 Nick Lamb * app/image_new.c: Still using RGB_IMAGE instead of GIMAGE (!) +>>>>>>> 1.1725 Mon Oct 18 21:24:47 BST 1999 Andy Thomas * app/bezier_select.c @@ -215,8 +221,13 @@ Mon Oct 18 21:24:47 BST 1999 Andy Thomas not on the curve the "new point" option will become selected and the new point will be added. +<<<<<<< ChangeLog + 2) The "new point" option is defaulted to on when a new image is created + or a new image is selected from the image menu. +======= 2) The "new point" option is defaulted to on when a new image is created or a new image is selected from the image menu. +>>>>>>> 1.1725 3) Move and flip tool now effect the path if it is locked. @@ -5913,7 +5924,7 @@ Sat May 29 23:43:56 PDT 1999 Manish Singh * libgimp/stdplugins-intl.h: #include -1999-05-30 Jens Lauterbacher +1999-05-30 Jens Lautenbacher Simon Budig Michael Natterer Adam D. Moss diff --git a/app/color_cmds.c b/app/color_cmds.c index 835b1aae76..aae0bbd866 100644 --- a/app/color_cmds.c +++ b/app/color_cmds.c @@ -398,7 +398,7 @@ desaturate_invoker (Argument *args) if (success) { - if (gimp_drawable_color (drawable)) + if (gimp_drawable_is_rgb (drawable)) desaturate (drawable); else success = FALSE; @@ -581,7 +581,7 @@ curves_spline_invoker (Argument *args) cd.drawable = drawable; cd.channel = channel; - cd.color = gimp_drawable_color (drawable); + cd.color = gimp_drawable_is_rgb (drawable); cd.curve_type = SMOOTH; for (j = 0; j < num_points / 2; j++) @@ -691,7 +691,7 @@ curves_explicit_invoker (Argument *args) cd.drawable = drawable; cd.channel = channel; - cd.color = gimp_drawable_color (drawable); + cd.color = gimp_drawable_is_rgb (drawable); for (j = 0; j < 256; j++) cd.curve[cd.channel][j] = curve[j]; @@ -929,7 +929,7 @@ histogram_invoker (Argument *args) htd.shell = NULL; htd.channel = channel; htd.drawable = drawable; - htd.color = gimp_drawable_color (drawable); + htd.color = gimp_drawable_is_rgb (drawable); htd.histogram = histogram_widget_new (HISTOGRAM_WIDTH, HISTOGRAM_HEIGHT); @@ -1201,7 +1201,7 @@ threshold_invoker (Argument *args) success = FALSE; else { - td.color = gimp_drawable_color (drawable); + td.color = gimp_drawable_is_rgb (drawable); td.low_threshold = low_threshold; td.high_threshold = high_threshold; diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index f9d47126f8..efbe5d7cab 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -522,7 +522,7 @@ gimp_drawable_get_tattoo (const GimpDrawable *drawable) } gboolean -gimp_drawable_color (GimpDrawable *drawable) +gimp_drawable_is_rgb (GimpDrawable *drawable) { if (gimp_drawable_type (drawable) == RGBA_GIMAGE || gimp_drawable_type (drawable) == RGB_GIMAGE) diff --git a/app/core/gimpdrawable.h b/app/core/gimpdrawable.h index 773aba2361..b4f44faec4 100644 --- a/app/core/gimpdrawable.h +++ b/app/core/gimpdrawable.h @@ -50,7 +50,7 @@ gint gimp_drawable_clean (GimpDrawable *); gboolean gimp_drawable_has_alpha (GimpDrawable *); GimpImageType gimp_drawable_type (GimpDrawable *); GimpImageType gimp_drawable_type_with_alpha (GimpDrawable *); -gboolean gimp_drawable_color (GimpDrawable *); +gboolean gimp_drawable_is_rgb (GimpDrawable *); gboolean gimp_drawable_is_gray (GimpDrawable *); gboolean gimp_drawable_is_indexed (GimpDrawable *); TileManager * gimp_drawable_data (GimpDrawable *); diff --git a/app/drawable.h b/app/drawable.h index 276cd96e88..6b72c30ba0 100644 --- a/app/drawable.h +++ b/app/drawable.h @@ -36,7 +36,7 @@ void drawable_apply_image (GimpDrawable *, gint, gint, gint, gint, #define drawable_type gimp_drawable_type #define drawable_has_alpha gimp_drawable_has_alpha #define drawable_type_with_alpha gimp_drawable_type_with_alpha -#define drawable_color gimp_drawable_color +#define drawable_color gimp_drawable_is_rgb #define drawable_gray gimp_drawable_is_gray #define drawable_indexed gimp_drawable_is_indexed #define drawable_data gimp_drawable_data diff --git a/app/drawable_cmds.c b/app/drawable_cmds.c index c8999bc98d..44dcf6c219 100644 --- a/app/drawable_cmds.c +++ b/app/drawable_cmds.c @@ -35,9 +35,9 @@ static ProcRecord drawable_image_proc; static ProcRecord drawable_type_proc; static ProcRecord drawable_has_alpha_proc; static ProcRecord drawable_type_with_alpha_proc; -static ProcRecord drawable_color_proc; -static ProcRecord drawable_gray_proc; -static ProcRecord drawable_indexed_proc; +static ProcRecord drawable_is_rgb_proc; +static ProcRecord drawable_is_gray_proc; +static ProcRecord drawable_is_indexed_proc; static ProcRecord drawable_bytes_proc; static ProcRecord drawable_width_proc; static ProcRecord drawable_height_proc; @@ -61,9 +61,9 @@ register_drawable_procs (void) procedural_db_register (&drawable_type_proc); procedural_db_register (&drawable_has_alpha_proc); procedural_db_register (&drawable_type_with_alpha_proc); - procedural_db_register (&drawable_color_proc); - procedural_db_register (&drawable_gray_proc); - procedural_db_register (&drawable_indexed_proc); + procedural_db_register (&drawable_is_rgb_proc); + procedural_db_register (&drawable_is_gray_proc); + procedural_db_register (&drawable_is_indexed_proc); procedural_db_register (&drawable_bytes_proc); procedural_db_register (&drawable_width_proc); procedural_db_register (&drawable_height_proc); @@ -528,20 +528,20 @@ static ProcRecord drawable_type_with_alpha_proc = }; static Argument * -drawable_color_invoker (Argument *args) +drawable_is_rgb_invoker (Argument *args) { Argument *return_args; GimpDrawable *drawable; drawable = gimp_drawable_get_ID (args[0].value.pdb_int); - return_args = procedural_db_return_args (&drawable_color_proc, TRUE); + return_args = procedural_db_return_args (&drawable_is_rgb_proc, TRUE); return_args[1].value.pdb_int = drawable_color (drawable); return return_args; } -static ProcArg drawable_color_inargs[] = +static ProcArg drawable_is_rgb_inargs[] = { { PDB_DRAWABLE, @@ -550,7 +550,7 @@ static ProcArg drawable_color_inargs[] = } }; -static ProcArg drawable_color_outargs[] = +static ProcArg drawable_is_rgb_outargs[] = { { PDB_INT32, @@ -559,9 +559,9 @@ static ProcArg drawable_color_outargs[] = } }; -static ProcRecord drawable_color_proc = +static ProcRecord drawable_is_rgb_proc = { - "gimp_drawable_color", + "gimp_drawable_is_rgb", "Returns whether the drawable is an RGB type.", "This procedure returns non-zero if the specified drawable is of type { RGB, RGBA }.", "Spencer Kimball & Peter Mattis", @@ -569,27 +569,27 @@ static ProcRecord drawable_color_proc = "1995-1996", PDB_INTERNAL, 1, - drawable_color_inargs, + drawable_is_rgb_inargs, 1, - drawable_color_outargs, - { { drawable_color_invoker } } + drawable_is_rgb_outargs, + { { drawable_is_rgb_invoker } } }; static Argument * -drawable_gray_invoker (Argument *args) +drawable_is_gray_invoker (Argument *args) { Argument *return_args; GimpDrawable *drawable; drawable = gimp_drawable_get_ID (args[0].value.pdb_int); - return_args = procedural_db_return_args (&drawable_gray_proc, TRUE); + return_args = procedural_db_return_args (&drawable_is_gray_proc, TRUE); return_args[1].value.pdb_int = drawable_gray (drawable); return return_args; } -static ProcArg drawable_gray_inargs[] = +static ProcArg drawable_is_gray_inargs[] = { { PDB_DRAWABLE, @@ -598,7 +598,7 @@ static ProcArg drawable_gray_inargs[] = } }; -static ProcArg drawable_gray_outargs[] = +static ProcArg drawable_is_gray_outargs[] = { { PDB_INT32, @@ -607,9 +607,9 @@ static ProcArg drawable_gray_outargs[] = } }; -static ProcRecord drawable_gray_proc = +static ProcRecord drawable_is_gray_proc = { - "gimp_drawable_gray", + "gimp_drawable_is_gray", "Returns whether the drawable is a grayscale type.", "This procedure returns non-zero if the specified drawable is of type { Gray, GrayA }.", "Spencer Kimball & Peter Mattis", @@ -617,27 +617,27 @@ static ProcRecord drawable_gray_proc = "1995-1996", PDB_INTERNAL, 1, - drawable_gray_inargs, + drawable_is_gray_inargs, 1, - drawable_gray_outargs, - { { drawable_gray_invoker } } + drawable_is_gray_outargs, + { { drawable_is_gray_invoker } } }; static Argument * -drawable_indexed_invoker (Argument *args) +drawable_is_indexed_invoker (Argument *args) { Argument *return_args; GimpDrawable *drawable; drawable = gimp_drawable_get_ID (args[0].value.pdb_int); - return_args = procedural_db_return_args (&drawable_indexed_proc, TRUE); + return_args = procedural_db_return_args (&drawable_is_indexed_proc, TRUE); return_args[1].value.pdb_int = drawable_indexed (drawable); return return_args; } -static ProcArg drawable_indexed_inargs[] = +static ProcArg drawable_is_indexed_inargs[] = { { PDB_DRAWABLE, @@ -646,7 +646,7 @@ static ProcArg drawable_indexed_inargs[] = } }; -static ProcArg drawable_indexed_outargs[] = +static ProcArg drawable_is_indexed_outargs[] = { { PDB_INT32, @@ -655,9 +655,9 @@ static ProcArg drawable_indexed_outargs[] = } }; -static ProcRecord drawable_indexed_proc = +static ProcRecord drawable_is_indexed_proc = { - "gimp_drawable_indexed", + "gimp_drawable_is_indexed", "Returns whether the drawable is an indexed type.", "This procedure returns non-zero if the specified drawable is of type { Indexed, IndexedA }.", "Spencer Kimball & Peter Mattis", @@ -665,10 +665,10 @@ static ProcRecord drawable_indexed_proc = "1995-1996", PDB_INTERNAL, 1, - drawable_indexed_inargs, + drawable_is_indexed_inargs, 1, - drawable_indexed_outargs, - { { drawable_indexed_invoker } } + drawable_is_indexed_outargs, + { { drawable_is_indexed_invoker } } }; static Argument * diff --git a/app/gimpdrawable.c b/app/gimpdrawable.c index f9d47126f8..efbe5d7cab 100644 --- a/app/gimpdrawable.c +++ b/app/gimpdrawable.c @@ -522,7 +522,7 @@ gimp_drawable_get_tattoo (const GimpDrawable *drawable) } gboolean -gimp_drawable_color (GimpDrawable *drawable) +gimp_drawable_is_rgb (GimpDrawable *drawable) { if (gimp_drawable_type (drawable) == RGBA_GIMAGE || gimp_drawable_type (drawable) == RGB_GIMAGE) diff --git a/app/gimpdrawable.h b/app/gimpdrawable.h index 773aba2361..b4f44faec4 100644 --- a/app/gimpdrawable.h +++ b/app/gimpdrawable.h @@ -50,7 +50,7 @@ gint gimp_drawable_clean (GimpDrawable *); gboolean gimp_drawable_has_alpha (GimpDrawable *); GimpImageType gimp_drawable_type (GimpDrawable *); GimpImageType gimp_drawable_type_with_alpha (GimpDrawable *); -gboolean gimp_drawable_color (GimpDrawable *); +gboolean gimp_drawable_is_rgb (GimpDrawable *); gboolean gimp_drawable_is_gray (GimpDrawable *); gboolean gimp_drawable_is_indexed (GimpDrawable *); TileManager * gimp_drawable_data (GimpDrawable *); diff --git a/docs/script-fu.tex b/docs/script-fu.tex index 14e1bd5fb0..ef7c730733 100644 --- a/docs/script-fu.tex +++ b/docs/script-fu.tex @@ -740,7 +740,7 @@ come a long way in two years. (plug-in-gauss-rle 1 img disp-map blur TRUE TRUE) (gimp-levels img disp-map 0 0 255 1.0 96 255) - (if (= (car (gimp-drawable-color bg-layer)) 1) + (if (= (car (gimp-drawable-is-rgb bg-layer)) 1) (gimp-convert-rgb img)) (gimp-image-add-layer img bg-layer 2) diff --git a/libgimp/gimp.def b/libgimp/gimp.def index d54c44ab94..f88a9363a6 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -36,7 +36,7 @@ EXPORTS gimp_drawable_parasite_attach gimp_drawable_bpp gimp_drawable_is_channel - gimp_drawable_color + gimp_drawable_is_rgb gimp_drawable_delete gimp_drawable_detach gimp_drawable_parasite_detach diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 777f1e171b..aec8e38824 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -694,7 +694,7 @@ guint gimp_drawable_bpp (gint32 drawable_ID); GDrawableType gimp_drawable_type (gint32 drawable_ID); gint gimp_drawable_visible (gint32 drawable_ID); gint gimp_drawable_is_channel (gint32 drawable_ID); -gint gimp_drawable_color (gint32 drawable_ID); +gint gimp_drawable_is_rgb (gint32 drawable_ID); gint gimp_drawable_is_gray (gint32 drawable_ID); gint gimp_drawable_has_alpha (gint32 drawable_ID); gint gimp_drawable_is_indexed (gint32 drawable_ID); diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index d92152422a..298905020a 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -285,13 +285,13 @@ gimp_drawable_is_channel (gint32 drawable_ID) } gint -gimp_drawable_color (gint32 drawable_ID) +gimp_drawable_is_rgb (gint32 drawable_ID) { GParam *return_vals; int nreturn_vals; int result; - return_vals = gimp_run_procedure ("gimp_drawable_color", + return_vals = gimp_run_procedure ("gimp_drawable_is_rgb", &nreturn_vals, PARAM_DRAWABLE, drawable_ID, PARAM_END); diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c index d92152422a..298905020a 100644 --- a/libgimp/gimpdrawable_pdb.c +++ b/libgimp/gimpdrawable_pdb.c @@ -285,13 +285,13 @@ gimp_drawable_is_channel (gint32 drawable_ID) } gint -gimp_drawable_color (gint32 drawable_ID) +gimp_drawable_is_rgb (gint32 drawable_ID) { GParam *return_vals; int nreturn_vals; int result; - return_vals = gimp_run_procedure ("gimp_drawable_color", + return_vals = gimp_run_procedure ("gimp_drawable_is_rgb", &nreturn_vals, PARAM_DRAWABLE, drawable_ID, PARAM_END); diff --git a/plug-ins/AlienMap/AlienMap.c b/plug-ins/AlienMap/AlienMap.c index 187aa07cc1..f92d45aa61 100644 --- a/plug-ins/AlienMap/AlienMap.c +++ b/plug-ins/AlienMap/AlienMap.c @@ -374,7 +374,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is indexed or RGB color */ - if (gimp_drawable_color (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init (_("AlienMap: Transforming ...")); diff --git a/plug-ins/AlienMap2/AlienMap2.c b/plug-ins/AlienMap2/AlienMap2.c index 37812b1df0..e1a4215f63 100644 --- a/plug-ins/AlienMap2/AlienMap2.c +++ b/plug-ins/AlienMap2/AlienMap2.c @@ -387,7 +387,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is indexed or RGB_MODEL color */ - if (gimp_drawable_color (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init (_("AlienMap2: Transforming ...")); diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index 57e2b31c22..7e68f8f429 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -297,7 +297,7 @@ run(char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is indexed or RGB color */ - if (gimp_drawable_color(drawable->id)) { + if (gimp_drawable_is_rgb(drawable->id)) { gimp_progress_init("Rendering fractal..."); /* Set the tile cache size */ diff --git a/plug-ins/Lighting/lighting_main.c b/plug-ins/Lighting/lighting_main.c index fae8f6fbd0..b50e2b58c2 100644 --- a/plug-ins/Lighting/lighting_main.c +++ b/plug-ins/Lighting/lighting_main.c @@ -226,7 +226,7 @@ static void run(gchar *name, /* Make sure that the drawable is RGBA or RGB color */ /* ================================================ */ - if (gimp_drawable_color(drawable->id)) + if (gimp_drawable_is_rgb(drawable->id)) { /* Set the tile cache size */ /* ======================= */ diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/MapObject/mapobject_ui.c index 1654e7b803..0c30d5f020 100644 --- a/plug-ins/MapObject/mapobject_ui.c +++ b/plug-ins/MapObject/mapobject_ui.c @@ -568,7 +568,7 @@ gint box_constrain(gint32 image_id, gint32 drawable_id, gpointer data) if (drawable_id == -1) return(TRUE); - return (gimp_drawable_color(drawable_id) && !gimp_drawable_is_indexed(drawable_id)); + return (gimp_drawable_is_rgb(drawable_id) && !gimp_drawable_is_indexed(drawable_id)); } void box_drawable_callback(gint32 id, gpointer data) @@ -585,7 +585,7 @@ gint cylinder_constrain(gint32 image_id, gint32 drawable_id, gpointer data) if (drawable_id == -1) return(TRUE); - return (gimp_drawable_color(drawable_id) && !gimp_drawable_is_indexed(drawable_id)); + return (gimp_drawable_is_rgb(drawable_id) && !gimp_drawable_is_indexed(drawable_id)); } void cylinder_drawable_callback(gint32 id, gpointer data) diff --git a/plug-ins/borderaverage/borderaverage.c b/plug-ins/borderaverage/borderaverage.c index dd5eb3816b..15ce607780 100644 --- a/plug-ins/borderaverage/borderaverage.c +++ b/plug-ins/borderaverage/borderaverage.c @@ -155,7 +155,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is RGB color */ - if (gimp_drawable_color (drawable->id)) { + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init ("borderaverage"); borderaverage (drawable, &result_color[0], &result_color[1], &result_color[2]); diff --git a/plug-ins/common/autocrop.c b/plug-ins/common/autocrop.c index b202a31587..54fd20c486 100644 --- a/plug-ins/common/autocrop.c +++ b/plug-ins/common/autocrop.c @@ -98,7 +98,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals, image_id = param[1].data.d_image; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color(drawable->id) || + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { diff --git a/plug-ins/common/autostretch_hsv.c b/plug-ins/common/autostretch_hsv.c index c6c1b3827c..3dcdaf2513 100644 --- a/plug-ins/common/autostretch_hsv.c +++ b/plug-ins/common/autostretch_hsv.c @@ -114,7 +114,7 @@ run (char *name, image_ID = param[1].data.d_image; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Auto-Stretching HSV...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index eb68968203..19f0e84563 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -260,7 +260,7 @@ run (gchar *name, break; } - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Adding Blinds ..."); diff --git a/plug-ins/common/blur.c b/plug-ins/common/blur.c index c1170f44f8..0bda881dd7 100644 --- a/plug-ins/common/blur.c +++ b/plug-ins/common/blur.c @@ -260,7 +260,7 @@ run(char *name, int nparams, GParam *param, int *nreturn_vals, /* * Make sure the drawable type is appropriate. */ - if (gimp_drawable_color(drawable->id) || + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id)) { switch (run_mode) { diff --git a/plug-ins/common/borderaverage.c b/plug-ins/common/borderaverage.c index dd5eb3816b..15ce607780 100644 --- a/plug-ins/common/borderaverage.c +++ b/plug-ins/common/borderaverage.c @@ -155,7 +155,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is RGB color */ - if (gimp_drawable_color (drawable->id)) { + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init ("borderaverage"); borderaverage (drawable, &result_color[0], &result_color[1], &result_color[2]); diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index 28c9f2b52f..4e72129cf0 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -443,7 +443,7 @@ run(char *name, /* Bumpmap the image */ if (status == STATUS_SUCCESS) { - if ((gimp_drawable_color(drawable->id) || + if ((gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* Set the tile cache size */ @@ -1546,7 +1546,7 @@ dialog_constrain(gint32 image_id, gint32 drawable_id, gpointer data) if (drawable_id == -1) return TRUE; - return (gimp_drawable_color(drawable_id) || gimp_drawable_is_gray(drawable_id)); + return (gimp_drawable_is_rgb(drawable_id) || gimp_drawable_is_gray(drawable_id)); } /* dialog_constrain */ diff --git a/plug-ins/common/c_astretch.c b/plug-ins/common/c_astretch.c index f555512811..930dbbcc8a 100644 --- a/plug-ins/common/c_astretch.c +++ b/plug-ins/common/c_astretch.c @@ -110,7 +110,7 @@ run (char *name, image_ID = param[1].data.d_image; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Auto-Stretching Contrast...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index dd088aa611..6add4f7d3f 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -159,7 +159,7 @@ run (gchar *name, break; } - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Adding Checkerboard...")); diff --git a/plug-ins/common/color_enhance.c b/plug-ins/common/color_enhance.c index 9cd8ff2d3d..44bf622de8 100644 --- a/plug-ins/common/color_enhance.c +++ b/plug-ins/common/color_enhance.c @@ -116,7 +116,7 @@ run (char *name, image_ID = param[1].data.d_image; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Color Enhance...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/convmatrix.c b/plug-ins/common/convmatrix.c index deffa3cb86..1673b9586f 100644 --- a/plug-ins/common/convmatrix.c +++ b/plug-ins/common/convmatrix.c @@ -234,7 +234,7 @@ static void run(char *name, int n_params, GParam * param, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color(drawable->id) || + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id)) { gimp_progress_init(_("Applying convolution")); gimp_tile_cache_ntiles(2 * (drawable->width / @@ -431,7 +431,7 @@ static void doit(void) height = drawable->height; bytes = drawable->bpp; - if(gimp_drawable_color(drawable->id)) + if(gimp_drawable_is_rgb(drawable->id)) for(i=0;i<3;i++) chanmask[i]=my_config.channels[i+1]; else /* Grayscale */ @@ -605,7 +605,7 @@ static void check_config(void){ for(i=0;i<5;i++) if(my_config.channels[i]<0) my_config.channels[i]=0; - if(gimp_drawable_color(drawable->id)) + if(gimp_drawable_is_rgb(drawable->id)) my_config.channels[0]=-1; else if(gimp_drawable_is_gray(drawable->id)) for(i=1;i<4;i++) diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index d10bf81b97..75472fb786 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -243,7 +243,7 @@ run (char *name, /* Render the cubism effect */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) + (gimp_drawable_is_rgb (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) { /* set cache size */ gimp_tile_cache_ntiles (SQR (4 * cvals.tile_size * cvals.tile_saturation) / SQR (gimp_tile_width ())); diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index 9deb496a61..b80f9a5177 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -1340,7 +1340,7 @@ bender_new_dialog (GDrawable *drawable) cd->rotation = 0.0; /* vertical bend */ cd->drawable = drawable; - cd->color = gimp_drawable_color (cd->drawable->id); + cd->color = gimp_drawable_is_rgb (cd->drawable->id); cd->run = FALSE; cd->bval_from = NULL; diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index 04eced97fc..6ba4b54054 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -126,7 +126,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("deinterlace"); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index f2bee033ea..8aa2ddb4a9 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -960,8 +960,8 @@ gint constraintResultSizeAndResultColorOrGray(gint32 imageId, gimp_drawable_width( dm->params.result)) && (gimp_drawable_height(drawableId) == gimp_drawable_height(dm->params.result)) && - ((gimp_drawable_color(drawableId) && - (gimp_drawable_color(dm->params.result))) || + ((gimp_drawable_is_rgb(drawableId) && + (gimp_drawable_is_rgb(dm->params.result))) || gimp_drawable_is_gray( drawableId)))); } diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 0265c0802a..25c58d7041 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -43,6 +43,9 @@ * Revision History: * * $Log$ + * Revision 1.17 1999/10/24 20:48:58 pcg + * api change #2, fix #1 + * * Revision 1.16 1999/10/17 00:07:38 pcg * API PATCH #2 or so * @@ -396,7 +399,7 @@ run(char *name, /* I - Name of filter program. */ if (status == STATUS_SUCCESS) { - if ((gimp_drawable_color(drawable->id) || + if ((gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 33684edaa5..ffa81877f0 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -250,7 +250,7 @@ run(char *name, /* I - Name of filter program. */ if (status == STATUS_SUCCESS) { - if ((gimp_drawable_color(drawable->id) || + if ((gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 447ab55d14..1be8b288f4 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -264,7 +264,7 @@ run(char *name, /* Create the diffraction pattern */ - if ((status == STATUS_SUCCESS) && gimp_drawable_color(active_drawable->id)) { + if ((status == STATUS_SUCCESS) && gimp_drawable_is_rgb(active_drawable->id)) { /* Set the tile cache size */ gimp_tile_cache_ntiles((active_drawable->width + gimp_tile_width() - 1) / gimp_tile_width()); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 3761f571b6..62a42ad004 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -226,7 +226,7 @@ run (gchar *name, } /* make sure the drawable exist and is not indexed */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Edge detection..."); @@ -267,7 +267,7 @@ init_tile_buf( TileBuf *buf, GDrawable *drawable ) buf->tile = NULL; buf->col = 0; buf->row = 0; - if ( gimp_drawable_color( drawable->id ) ) + if ( gimp_drawable_is_rgb( drawable->id ) ) buf->bpp = 3; else buf->bpp = 1; diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index 7a8f1f12c7..0dbe5cda95 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -322,7 +322,7 @@ engrave_large(GDrawable * drawable, gint height, gint limit) gimp_drawable_mask_bounds(drawable->id, &x1, &y1, &x2, &y2); - if (gimp_drawable_color(drawable->id)) + if (gimp_drawable_is_rgb(drawable->id)) bpp = 3; else bpp = 1; @@ -440,7 +440,7 @@ engrave_small(GDrawable * drawable, gint height, gint limit, gint tile_width) max_progress = (x2 - x1) * (y2 - y1); bpp = drawable->bpp; - if (gimp_drawable_color(drawable->id)) + if (gimp_drawable_is_rgb(drawable->id)) color_n = 3; else color_n = 1; diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index 9e538b84d2..4393256bfa 100644 --- a/plug-ins/common/exchange.c +++ b/plug-ins/common/exchange.c @@ -197,7 +197,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret } if (status == STATUS_SUCCESS) { - if (gimp_drawable_color(drw->id)) + if (gimp_drawable_is_rgb(drw->id)) { gimp_progress_init("Color Exchange..."); gimp_tile_cache_ntiles(2 * (drw->width / gimp_tile_width() + 1)); diff --git a/plug-ins/common/flarefx.c b/plug-ins/common/flarefx.c index b8b7f856ab..a37fb87bfe 100644 --- a/plug-ins/common/flarefx.c +++ b/plug-ins/common/flarefx.c @@ -254,7 +254,7 @@ static void run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Render flare..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/fp.c b/plug-ins/common/fp.c index 27364dfc91..8a2c23e297 100644 --- a/plug-ins/common/fp.c +++ b/plug-ins/common/fp.c @@ -97,7 +97,7 @@ run (char *name, status = STATUS_EXECUTION_ERROR; } - else if (gimp_drawable_color (drawable->id) && fp_dialog()) + else if (gimp_drawable_is_rgb (drawable->id) && fp_dialog()) { gimp_progress_init ("Applying the Filter Pack..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/fractaltrace.c b/plug-ins/common/fractaltrace.c index 4a72fcfdc7..cf1ac4ace4 100644 --- a/plug-ins/common/fractaltrace.c +++ b/plug-ins/common/fractaltrace.c @@ -187,7 +187,7 @@ static void run( char *name, int argc, GParam *args, int *retc, GParam **rets ) pixels_init( drawable ); - if( !gimp_drawable_color( drawable->id ) && + if( !gimp_drawable_is_rgb( drawable->id ) && !gimp_drawable_is_gray( drawable->id ) ){ status = STATUS_EXECUTION_ERROR; } diff --git a/plug-ins/common/gauss_iir.c b/plug-ins/common/gauss_iir.c index 750ddbc05c..43423d5d39 100644 --- a/plug-ins/common/gauss_iir.c +++ b/plug-ins/common/gauss_iir.c @@ -201,7 +201,7 @@ run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("IIR Gaussian Blur"); diff --git a/plug-ins/common/gauss_rle.c b/plug-ins/common/gauss_rle.c index 9d28702482..fefc487ed7 100644 --- a/plug-ins/common/gauss_rle.c +++ b/plug-ins/common/gauss_rle.c @@ -194,7 +194,7 @@ run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("RLE Gaussian Blur"); diff --git a/plug-ins/common/glasstile.c b/plug-ins/common/glasstile.c index dc24aff828..c43989093e 100644 --- a/plug-ins/common/glasstile.c +++ b/plug-ins/common/glasstile.c @@ -170,7 +170,7 @@ static void run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Glass Tile..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/gqbist.c b/plug-ins/common/gqbist.c index 315e485c89..1002d40ef4 100644 --- a/plug-ins/common/gqbist.c +++ b/plug-ins/common/gqbist.c @@ -331,7 +331,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret img_has_alpha = gimp_drawable_has_alpha(drawable->id); gimp_drawable_mask_bounds(drawable->id, &sel_x1, &sel_y1, &sel_x2, &sel_y2); - if (!gimp_drawable_color(drawable->id)) + if (!gimp_drawable_is_rgb(drawable->id)) status=STATUS_CALLING_ERROR; if (status==STATUS_SUCCESS) { diff --git a/plug-ins/common/gradmap.c b/plug-ins/common/gradmap.c index c52e272fe5..b2c863fc6f 100644 --- a/plug-ins/common/gradmap.c +++ b/plug-ins/common/gradmap.c @@ -142,7 +142,7 @@ run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Gradient Map..."); gimp_tile_cache_ntiles (TILE_CACHE_SIZE); @@ -181,7 +181,7 @@ gradmap (GDrawable *drawable) gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2); bpp = alpha = gimp_drawable_bpp( drawable->id ); - color = gimp_drawable_color( drawable->id ); + color = gimp_drawable_is_rgb( drawable->id ); has_alpha = gimp_drawable_has_alpha( drawable->id ); if( has_alpha ) alpha--; @@ -253,7 +253,7 @@ get_samples (GDrawable *drawable) f_samples = gimp_gradients_sample_uniform (NSAMPLES); bpp = gimp_drawable_bpp (drawable->id); - color = gimp_drawable_color (drawable->id); + color = gimp_drawable_is_rgb (drawable->id); has_alpha = gimp_drawable_has_alpha (drawable->id); alpha = (has_alpha ? bpp - 1 : bpp); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 762ab22cce..5d8e486e4f 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -163,7 +163,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Drawing Grid...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index 831cdf5050..10d6318f06 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -168,7 +168,7 @@ static void run( char *name, if( status == STATUS_SUCCESS ){ - if( gimp_drawable_color( drawable->id ) || + if( gimp_drawable_is_rgb( drawable->id ) || gimp_drawable_is_gray( drawable->id ) ){ gimp_tile_cache_ntiles( 2 * ( drawable->width / gimp_tile_width() + 1 ) ); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 7bd250ee23..9d2dcf2560 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -262,7 +262,7 @@ run (char *name, destdrawable = drawable = gimp_drawable_get (param[2].data.d_drawable); imageID = param[1].data.d_int32; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) { + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { switch ( run_mode) { case RUN_INTERACTIVE : gimp_get_data("plug_in_iwarp",&iwarp_vals); diff --git a/plug-ins/common/laplace.c b/plug-ins/common/laplace.c index d5024951be..111b969b8d 100644 --- a/plug-ins/common/laplace.c +++ b/plug-ins/common/laplace.c @@ -105,7 +105,7 @@ run (char *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); laplace (drawable); diff --git a/plug-ins/common/lic.c b/plug-ins/common/lic.c index 18c73e69e9..31b7038dc6 100644 --- a/plug-ins/common/lic.c +++ b/plug-ins/common/lic.c @@ -957,7 +957,7 @@ gint effect_image_constrain(gint32 image_id, gint32 drawable_id, gpointer data) if (drawable_id == -1) return(TRUE); - return(gimp_drawable_color(drawable_id)); + return(gimp_drawable_is_rgb(drawable_id)); } void effect_image_callback(gint32 id, gpointer data) @@ -1363,7 +1363,7 @@ static void run(gchar *name, /* Make sure that the drawable is RGBA or RGB color */ /* ================================================ */ - if (gimp_drawable_color(drawable->id)) + if (gimp_drawable_is_rgb(drawable->id)) { /* Set the tile cache size */ /* ======================= */ diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index 936e2537c9..8137aa8dfe 100644 --- a/plug-ins/common/mapcolor.c +++ b/plug-ins/common/mapcolor.c @@ -213,7 +213,7 @@ run (char *name, /* Make sure the drawable is RGB color */ drawable = gimp_drawable_get (param[2].data.d_drawable); - if (!gimp_drawable_color (drawable->id)) + if (!gimp_drawable_is_rgb (drawable->id)) { gimp_message ("color_adjust/color_map: cannot operate on grey/indexed\ images"); diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c index 961a6ecc35..c6f2bf37d1 100644 --- a/plug-ins/common/max_rgb.c +++ b/plug-ins/common/max_rgb.c @@ -167,7 +167,7 @@ run (char *name, hold_max = VALS.max_p; hold_min = VALS.max_p ? 0 : 1; /* Since a channel might be selected, we must check wheter RGB or not. */ - if (!gimp_drawable_color(drawable_id)) + if (!gimp_drawable_is_rgb(drawable_id)) { ERROR_DIALOG (1, "RGB drawable is not selected."); return; diff --git a/plug-ins/common/mblur.c b/plug-ins/common/mblur.c index e2127c06f5..c2f15b6aaa 100644 --- a/plug-ins/common/mblur.c +++ b/plug-ins/common/mblur.c @@ -260,7 +260,7 @@ run(char *name, /* Blur the image */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color(drawable->id) || + (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* Set the tile cache size */ diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 41c3bbcf87..1fbee5df53 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -411,7 +411,7 @@ run (char *name, /* Create the mosaic */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) + (gimp_drawable_is_rgb (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) { /* set the tile cache size so that the gaussian blur works well */ gimp_tile_cache_ntiles (2 * (MAX (active_drawable->width, active_drawable->height) / diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index c448c60a38..4ab9e90e45 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -656,7 +656,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init("Newsprintifing..."); diff --git a/plug-ins/common/noisify.c b/plug-ins/common/noisify.c index f1e7455b72..faa941e695 100644 --- a/plug-ins/common/noisify.c +++ b/plug-ins/common/noisify.c @@ -192,7 +192,7 @@ run (char *name, } /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Adding Noise..."); gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/normalize.c b/plug-ins/common/normalize.c index f5d03b801c..3f8a8cfc73 100644 --- a/plug-ins/common/normalize.c +++ b/plug-ins/common/normalize.c @@ -110,7 +110,7 @@ run (char *name, image_ID = param[1].data.d_image; /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init (_("Normalizing...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index daeafff953..b1cf9aa5ad 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -319,7 +319,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Rendering..."); gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index 0455c4fb6e..80d048c1f1 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -193,12 +193,12 @@ run (char *name, /* Make sure that the drawable is gray or RGB color */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id))) + (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id))) { gimp_progress_init (_("Oil Painting...")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); - if (gimp_drawable_color (drawable->id) && (ovals.mode == MODE_INTEN)) + if (gimp_drawable_is_rgb (drawable->id) && (ovals.mode == MODE_INTEN)) oilify_intensity (drawable); else oilify_rgb (drawable); diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index 51aa910e6a..8c8680a939 100644 --- a/plug-ins/common/papertile.c +++ b/plug-ins/common/papertile.c @@ -1198,7 +1198,7 @@ plugin_run ( gchar * name, p.selection.width = p.selection.x1 - p.selection.x0; p.selection.height = p.selection.y1 - p.selection.y0; - if( gimp_drawable_color( p.drawable->id ) ){ + if( gimp_drawable_is_rgb( p.drawable->id ) ){ switch( p.run_mode ){ case RUN_INTERACTIVE: { params_load_from_gimp(); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index ada3c3c8be..181b2a1cd3 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -247,7 +247,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Pixelizing..."); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index 6b8f4e21c8..3ab304ed4d 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -224,7 +224,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Plasma..."); gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/polar.c b/plug-ins/common/polar.c index 11de64b8af..929489be47 100644 --- a/plug-ins/common/polar.c +++ b/plug-ins/common/polar.c @@ -342,7 +342,7 @@ run(char *name, /* Distort the image */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color(drawable->id) || + (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* Set the tile cache size */ diff --git a/plug-ins/common/randomize.c b/plug-ins/common/randomize.c index 95837bc614..c90e878615 100644 --- a/plug-ins/common/randomize.c +++ b/plug-ins/common/randomize.c @@ -307,7 +307,7 @@ run(char *name, int nparams, GParam *param, int *nreturn_vals, /* * Make sure the drawable type is appropriate. */ - if (gimp_drawable_color(drawable->id) || + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index 193f1b67bf..28b8642313 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -233,7 +233,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Rippling..."); diff --git a/plug-ins/common/rotators.c b/plug-ins/common/rotators.c index f256cd9881..d5840649b5 100644 --- a/plug-ins/common/rotators.c +++ b/plug-ins/common/rotators.c @@ -168,7 +168,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals, image_id = param[1].data.d_image; /* Make sure that the drawable is gray or RGB or indexed */ - if (gimp_drawable_color(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { gimp_tile_cache_ntiles(7 + 2*( diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c index 2dc8c6ba96..d293d335bb 100644 --- a/plug-ins/common/sample_colorize.c +++ b/plug-ins/common/sample_colorize.c @@ -359,7 +359,7 @@ run (gchar *name, p_clear_tables(); /* Make sure that the dst_drawable is gray or RGB color */ - if (gimp_drawable_color (dst_drawable->id) || gimp_drawable_is_gray (dst_drawable->id)) + if (gimp_drawable_is_rgb (dst_drawable->id) || gimp_drawable_is_gray (dst_drawable->id)) { gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/scatter_hsv.c b/plug-ins/common/scatter_hsv.c index e119d87f23..2d021e8ecb 100644 --- a/plug-ins/common/scatter_hsv.c +++ b/plug-ins/common/scatter_hsv.c @@ -204,7 +204,7 @@ run (char *name, { case RUN_INTERACTIVE: gimp_get_data (PLUG_IN_NAME, &VALS); - if (!gimp_drawable_color(drawable_id)) + if (!gimp_drawable_is_rgb(drawable_id)) { scatter_hsv_error_dialog (1, (guchar *)"RGB drawable is not selected."); return; diff --git a/plug-ins/common/sel_gauss.c b/plug-ins/common/sel_gauss.c index 9c5a92a5a5..d94c468c2d 100644 --- a/plug-ins/common/sel_gauss.c +++ b/plug-ins/common/sel_gauss.c @@ -198,7 +198,7 @@ static void run ( drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Selective Gaussian Blur"); diff --git a/plug-ins/common/semiflatten.c b/plug-ins/common/semiflatten.c index b1da2ef504..8d8436dc2c 100644 --- a/plug-ins/common/semiflatten.c +++ b/plug-ins/common/semiflatten.c @@ -119,7 +119,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is indexed or RGB color */ - if (gimp_drawable_color (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init ("Semi-Flatten..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index 219d3353cd..f5548d2ee5 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -44,6 +44,9 @@ * Revision History: * * $Log$ + * Revision 1.12 1999/10/24 20:48:59 pcg + * api change #2, fix #1 + * * Revision 1.11 1999/10/17 00:07:40 pcg * API PATCH #2 or so * @@ -355,7 +358,7 @@ run(char *name, /* I - Name of filter program. */ if (status == STATUS_SUCCESS) { - if ((gimp_drawable_color(drawable->id) || + if ((gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 30f1ea901a..786643d976 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -198,7 +198,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Shifting..."); diff --git a/plug-ins/common/smooth_palette.c b/plug-ins/common/smooth_palette.c index 3102223340..eae5d8ed20 100644 --- a/plug-ins/common/smooth_palette.c +++ b/plug-ins/common/smooth_palette.c @@ -154,7 +154,7 @@ run (char *name, if (status == STATUS_SUCCESS) { drawable = gimp_drawable_get(param[2].data.d_drawable); - if (gimp_drawable_color(drawable->id)) { + if (gimp_drawable_is_rgb(drawable->id)) { gimp_progress_init ("Deriving smooth palette..."); gimp_tile_cache_ntiles (2 * (drawable->width + 1) / gimp_tile_width ()); values[1].data.d_image = doit(drawable, &values[2].data.d_layer); diff --git a/plug-ins/common/snoise.c b/plug-ins/common/snoise.c index 644a18b38a..7660ce9624 100644 --- a/plug-ins/common/snoise.c +++ b/plug-ins/common/snoise.c @@ -253,7 +253,7 @@ run (char *name, int nparams, GParam *param, int *nreturn_vals, } /* Create texture */ - if ((status == STATUS_SUCCESS) && (gimp_drawable_color (drawable->id) || + if ((status == STATUS_SUCCESS) && (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id))) { /* Set the tile cache size */ diff --git a/plug-ins/common/sobel.c b/plug-ins/common/sobel.c index 6ae436bfc1..dadf0f6157 100644 --- a/plug-ins/common/sobel.c +++ b/plug-ins/common/sobel.c @@ -201,7 +201,7 @@ run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); sobel (drawable, bvals.horizontal, bvals.vertical, bvals.keep_sign); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 6f8f127de3..b025e8e902 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -306,7 +306,7 @@ run (char *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Sparkling..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/spread.c b/plug-ins/common/spread.c index 3fbfd73607..b5f4ba4f5d 100644 --- a/plug-ins/common/spread.c +++ b/plug-ins/common/spread.c @@ -191,7 +191,7 @@ run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Spreading..."); diff --git a/plug-ins/common/threshold_alpha.c b/plug-ins/common/threshold_alpha.c index b6b7a35d3b..5314bef156 100644 --- a/plug-ins/common/threshold_alpha.c +++ b/plug-ins/common/threshold_alpha.c @@ -236,7 +236,7 @@ run (char *name, ERROR_DIALOG (1, "The layer preserves transparency."); return; } - if (!gimp_drawable_color (drawable_id) && + if (!gimp_drawable_is_rgb (drawable_id) && !gimp_drawable_is_gray (drawable_id)) { ERROR_DIALOG (1, "RGBA/GRAYA drawable is not selected."); @@ -284,7 +284,7 @@ MAIN_FUNCTION (gint32 drawable_id) drawable = gimp_drawable_get (drawable_id); if (! gimp_drawable_has_alpha (drawable_id)) return STATUS_EXECUTION_ERROR; - if (gimp_drawable_color(drawable_id)) + if (gimp_drawable_is_rgb(drawable_id)) gap = 3; else gap = 1; diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index e3819701e8..97a2feb384 100644 --- a/plug-ins/common/tileit.c +++ b/plug-ins/common/tileit.c @@ -298,7 +298,7 @@ run (gchar *name, break; } - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { /* Set the tile cache size */ diff --git a/plug-ins/common/tiler.c b/plug-ins/common/tiler.c index fba3d582bd..4fea6a0002 100644 --- a/plug-ins/common/tiler.c +++ b/plug-ins/common/tiler.c @@ -84,7 +84,7 @@ run (char *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); tile(drawable); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index 2522b114f7..11081426f4 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -1899,7 +1899,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id)) { gimp_progress_init ("Video/RGB..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () diff --git a/plug-ins/common/vinvert.c b/plug-ins/common/vinvert.c index 6791943d4e..8ab81ad480 100644 --- a/plug-ins/common/vinvert.c +++ b/plug-ins/common/vinvert.c @@ -254,7 +254,7 @@ run (char *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is indexed or RGB color */ - if (gimp_drawable_color (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id)) { if (run_mode != RUN_NONINTERACTIVE) gimp_progress_init ("Value Invert..."); diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index 7fa424b2c5..7c58873823 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -330,7 +330,7 @@ run(char *name, /* Distort the image */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color(drawable->id) || + (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { /* Set the tile cache size */ diff --git a/plug-ins/common/zealouscrop.c b/plug-ins/common/zealouscrop.c index ade52f8ae3..92a7d57a16 100644 --- a/plug-ins/common/zealouscrop.c +++ b/plug-ins/common/zealouscrop.c @@ -101,7 +101,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals, image_id = param[1].data.d_image; /* Make sure that the drawable is gray or RGB or indexed */ - if (gimp_drawable_color(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { + if (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id) || gimp_drawable_is_indexed(drawable->id)) { gimp_progress_init(_("ZealousCropping(tm)...")); gimp_tile_cache_ntiles(1 + 2*( diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 08b18e2ac6..44a58233c5 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -198,7 +198,7 @@ static void run(char *name, int n_params, GParam * param, int *nreturn_vals, if (status == STATUS_SUCCESS) { - if (gimp_drawable_color(drawable->id)) { + if (gimp_drawable_is_rgb(drawable->id)) { gimp_progress_init("Drawing Flame..."); gimp_tile_cache_ntiles(2 * (drawable->width / gimp_tile_width() + 1)); diff --git a/plug-ins/fp/fp.c b/plug-ins/fp/fp.c index 27364dfc91..8a2c23e297 100644 --- a/plug-ins/fp/fp.c +++ b/plug-ins/fp/fp.c @@ -97,7 +97,7 @@ run (char *name, status = STATUS_EXECUTION_ERROR; } - else if (gimp_drawable_color (drawable->id) && fp_dialog()) + else if (gimp_drawable_is_rgb (drawable->id) && fp_dialog()) { gimp_progress_init ("Applying the Filter Pack..."); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index df19668a86..c620689001 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -713,7 +713,7 @@ run (gchar *name, break; } - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { /* Set the tile cache size */ diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gflare/gflare.c index aeea30dbcd..6844be11f6 100644 --- a/plug-ins/gflare/gflare.c +++ b/plug-ins/gflare/gflare.c @@ -756,7 +756,7 @@ plugin_run (gchar *name, */ drawable = gimp_drawable_get (param[2].data.d_drawable); - dinfo.is_color = gimp_drawable_color (drawable->id); + dinfo.is_color = gimp_drawable_is_rgb (drawable->id); dinfo.has_alpha = gimp_drawable_has_alpha (drawable->id); gimp_drawable_mask_bounds (drawable->id, &dinfo.x1, &dinfo.y1, &dinfo.x2, &dinfo.y2); @@ -831,7 +831,7 @@ plugin_run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("Gradient Flare..."); plugin_do (); diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c index 79fc44b72c..1616e22a42 100644 --- a/plug-ins/gimpressionist/brush.c +++ b/plug-ins/gimpressionist/brush.c @@ -208,7 +208,7 @@ void savebrush(GtkWidget *wg, gpointer data) gint validdrawable(gint32 imageid, gint32 drawableid, gpointer data) { if(drawableid == -1) return TRUE; - return (gimp_drawable_color(drawableid) || gimp_drawable_is_gray(drawableid)); + return (gimp_drawable_is_rgb(drawableid) || gimp_drawable_is_gray(drawableid)); } void reloadbrush(char *fn, struct ppm *p) diff --git a/plug-ins/gimpressionist/gimp.c b/plug-ins/gimpressionist/gimp.c index e34f542cdc..9d9e25efd3 100644 --- a/plug-ins/gimpressionist/gimp.c +++ b/plug-ins/gimpressionist/gimp.c @@ -168,7 +168,7 @@ run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **return_v status = STATUS_EXECUTION_ERROR; break; } - if((status == STATUS_SUCCESS) && (gimp_drawable_color(drawable->id) || gimp_drawable_is_gray(drawable->id))) { + if((status == STATUS_SUCCESS) && (gimp_drawable_is_rgb(drawable->id) || gimp_drawable_is_gray(drawable->id))) { gimpressionist_main(); gimp_displays_flush (); diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index dfcdda3dab..c926000c99 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -437,7 +437,7 @@ run (char *name, /* Render the fractal */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) + (gimp_drawable_is_rgb (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) { /* set the tile cache size so that the operation works well */ gimp_tile_cache_ntiles (2 * (MAX (active_drawable->width, active_drawable->height) / diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c index 76aff75788..0055cfa84a 100644 --- a/plug-ins/imagemap/imap_main.c +++ b/plug-ins/imagemap/imap_main.c @@ -155,7 +155,7 @@ run(char *name, int n_params, GParam *param, int *nreturn_vals, _image_width = gimp_image_width(param[1].data.d_image); _image_height = gimp_image_height(param[1].data.d_image); - _map_info.color = gimp_drawable_color(drawable->id); + _map_info.color = gimp_drawable_is_rgb(drawable->id); run_mode = (GRunModeType) param[0].data.d_int32; diff --git a/plug-ins/maze/maze.c b/plug-ins/maze/maze.c index 1149e1f8be..e32b50834b 100644 --- a/plug-ins/maze/maze.c +++ b/plug-ins/maze/maze.c @@ -228,7 +228,7 @@ run (gchar *name, } /* color, gray, or indexed... hmm, miss anything? ;) */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id) || gimp_drawable_is_indexed (drawable->id)) { + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id) || gimp_drawable_is_indexed (drawable->id)) { maze (drawable); diff --git a/plug-ins/mosaic/mosaic.c b/plug-ins/mosaic/mosaic.c index 41c3bbcf87..1fbee5df53 100644 --- a/plug-ins/mosaic/mosaic.c +++ b/plug-ins/mosaic/mosaic.c @@ -411,7 +411,7 @@ run (char *name, /* Create the mosaic */ if ((status == STATUS_SUCCESS) && - (gimp_drawable_color (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) + (gimp_drawable_is_rgb (active_drawable->id) || gimp_drawable_is_gray (active_drawable->id))) { /* set the tile cache size so that the gaussian blur works well */ gimp_tile_cache_ntiles (2 * (MAX (active_drawable->width, active_drawable->height) / diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index d3bb39d249..2fa9571d25 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -333,7 +333,7 @@ static void run (gchar * name, drawable = gimp_drawable_get (param[2].data.d_drawable); image_id = param[1].data.d_image; - if ((gimp_drawable_color (drawable->id) + if ((gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) && gimp_drawable_has_alpha (drawable->id)) { @@ -798,7 +798,7 @@ static void do_curl_effect (void) { gpointer pr; guchar *grad_samples = NULL; - color_image = gimp_drawable_color (drawable->id); + color_image = gimp_drawable_is_rgb (drawable->id); curl_layer = gimp_drawable_get (gimp_layer_new (image_id, "Curl layer", @@ -1023,7 +1023,7 @@ static guchar *get_samples (GDrawable *drawable) { f_samples = gimp_gradients_sample_uniform (NGRADSAMPLES); bpp = gimp_drawable_bpp (drawable->id); - color = gimp_drawable_color (drawable->id); + color = gimp_drawable_is_rgb (drawable->id); has_alpha = gimp_drawable_has_alpha (drawable->id); alpha = (has_alpha ? bpp - 1 : bpp); diff --git a/plug-ins/pygimp/gimpmodule.c b/plug-ins/pygimp/gimpmodule.c index dab1dbee83..0e2463fd8c 100644 --- a/plug-ins/pygimp/gimpmodule.c +++ b/plug-ins/pygimp/gimpmodule.c @@ -2395,7 +2395,7 @@ lay_getattr(self, name) return (PyObject *)newimgobject(id); } if (!strcmp(name, "is_color") || !strcmp(name, "is_colour")) - return PyInt_FromLong(gimp_drawable_color(self->ID)); + return PyInt_FromLong(gimp_drawable_is_rgb(self->ID)); if (!strcmp(name, "is_floating_selection")) return PyInt_FromLong( gimp_layer_is_floating_selection(self->ID)); @@ -2694,7 +2694,7 @@ chn_getattr(self, name) return (PyObject *)newimgobject(id); } if (!strcmp(name, "is_color") || !strcmp(name, "is_colour")) - return PyInt_FromLong(gimp_drawable_color(self->ID)); + return PyInt_FromLong(gimp_drawable_is_rgb(self->ID)); if (!strcmp(name, "is_gray") || !strcmp(name, "is_grey")) return PyInt_FromLong(gimp_drawable_is_gray(self->ID)); if (!strcmp(name, "is_indexed")) diff --git a/plug-ins/rcm/rcm.c b/plug-ins/rcm/rcm.c index ad7ce8ef77..799565d5d8 100644 --- a/plug-ins/rcm/rcm.c +++ b/plug-ins/rcm/rcm.c @@ -260,7 +260,7 @@ void run(char *name, int nparams, GParam *param, int *nreturn_vals, GParam **ret { /* call dialog and rotate the colormap */ - if (gimp_drawable_color(Current.drawable->id) && rcm_dialog()) + if (gimp_drawable_is_rgb(Current.drawable->id) && rcm_dialog()) { gimp_progress_init(_("Rotating the colormap...")); diff --git a/plug-ins/script-fu/scripts/crystal-logo.scm b/plug-ins/script-fu/scripts/crystal-logo.scm index 4866200393..80db79b9b2 100644 --- a/plug-ins/script-fu/scripts/crystal-logo.scm +++ b/plug-ins/script-fu/scripts/crystal-logo.scm @@ -142,7 +142,7 @@ (plug-in-gauss-rle 1 img disp-map blur TRUE TRUE) (gimp-levels disp-map 0 0 255 1.0 96 255) - (if (= (car (gimp-drawable-color bg-layer)) 1) + (if (= (car (gimp-drawable-is-rgb bg-layer)) 1) (gimp-convert-rgb img)) diff --git a/plug-ins/sinus/sinus.c b/plug-ins/sinus/sinus.c index c52ec06840..c416a2af4e 100644 --- a/plug-ins/sinus/sinus.c +++ b/plug-ins/sinus/sinus.c @@ -250,7 +250,7 @@ static void run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); /* Make sure that the drawable is gray or RGB */ - if (( status == STATUS_SUCCESS) && (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id))) + if (( status == STATUS_SUCCESS) && (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id))) { gimp_progress_init("Calculating picture..."); gimp_tile_cache_ntiles( 1 ); diff --git a/plug-ins/struc/struc.c b/plug-ins/struc/struc.c index 83ff5d2cab..c388fb62f3 100644 --- a/plug-ins/struc/struc.c +++ b/plug-ins/struc/struc.c @@ -185,7 +185,7 @@ static void run (gchar *name, if (status == STATUS_SUCCESS) { /* Make sure that the drawable is gray or RGB color */ - if (gimp_drawable_color (drawable->id) || gimp_drawable_is_gray (drawable->id)) + if (gimp_drawable_is_rgb (drawable->id) || gimp_drawable_is_gray (drawable->id)) { gimp_progress_init ("struc"); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/po/gimp.pot b/po/gimp.pot index 9d3b1afdd7..e7769e926b 100644 --- a/po/gimp.pot +++ b/po/gimp.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-10-17 01:34+0200\n" +"POT-Creation-Date: 1999-10-24 16:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -124,11 +124,11 @@ msgstr "" msgid "Corrupt curve" msgstr "" -#: app/bezier_select.c:2829 +#: app/bezier_select.c:2855 msgid "Curve not closed!" msgstr "" -#: app/bezier_select.c:3164 +#: app/bezier_select.c:3148 app/gimage_mask.c:604 msgid "Paintbrush operation failed." msgstr "" @@ -943,7 +943,7 @@ msgid "Allow Enlarging" msgstr "" #. tool toggle -#: app/crop.c:209 app/flip_tool.c:88 +#: app/crop.c:209 app/flip_tool.c:89 msgid "Tool Toggle" msgstr "" @@ -1132,11 +1132,11 @@ msgstr "" msgid "drawable_fill called with unknown fill type" msgstr "" -#: app/edit_selection.c:163 +#: app/edit_selection.c:164 msgid "Move: 0, 0" msgstr "" -#: app/edit_selection.c:442 app/edit_selection.c:452 +#: app/edit_selection.c:447 app/edit_selection.c:457 msgid "Move: " msgstr "" @@ -1345,17 +1345,17 @@ msgstr "" msgid "No" msgstr "" -#: app/flip_tool.c:74 app/preferences_dialog.c:1287 +#: app/flip_tool.c:75 app/preferences_dialog.c:1287 #: app/preferences_dialog.c:2027 msgid "Horizontal" msgstr "" -#: app/flip_tool.c:74 app/preferences_dialog.c:1289 +#: app/flip_tool.c:75 app/preferences_dialog.c:1289 #: app/preferences_dialog.c:2029 msgid "Vertical" msgstr "" -#: app/flip_tool.c:80 +#: app/flip_tool.c:81 msgid "Flip Tool Options" msgstr "" @@ -1668,34 +1668,34 @@ msgid "" "Close anyway?" msgstr "" -#: app/gimage_mask.c:212 +#: app/gimage_mask.c:206 msgid "" "Unable to cut/copy because the selected\n" "region is empty." msgstr "" -#: app/gimage_mask.c:342 +#: app/gimage_mask.c:336 msgid "Float Selection: No selection to float." msgstr "" #. Create a new layer from the buffer -#: app/gimage_mask.c:353 +#: app/gimage_mask.c:347 msgid "Floated Layer" msgstr "" -#: app/gimage_mask.c:490 +#: app/gimage_mask.c:484 msgid "" "The active layer has no alpha channel\n" "to convert to a selection." msgstr "" -#: app/gimage_mask.c:509 +#: app/gimage_mask.c:503 msgid "" "The active layer has no mask\n" "to convert to a selection." msgstr "" -#: app/gimage_mask.c:556 +#: app/gimage_mask.c:554 msgid "No selection to stroke!" msgstr "" @@ -3252,11 +3252,11 @@ msgstr "" msgid "/Delete Layer" msgstr "" -#: app/layers_dialog.c:1035 app/menus.c:465 +#: app/layers_dialog.c:1035 app/menus.c:467 msgid "/Scale Layer" msgstr "" -#: app/layers_dialog.c:1036 app/menus.c:467 +#: app/layers_dialog.c:1036 app/menus.c:465 msgid "/Resize Layer" msgstr "" @@ -3457,7 +3457,7 @@ msgstr "" msgid "Load/Save Levels" msgstr "" -#: app/levels.c:1403 app/levels.c:1421 app/paths_dialog.c:2202 +#: app/levels.c:1403 app/levels.c:1421 app/paths_dialog.c:2225 #, c-format msgid "Unable to open file %s" msgstr "" @@ -4388,53 +4388,53 @@ msgstr "" msgid "Edit Point" msgstr "" -#: app/paths_dialog.c:416 +#: app/paths_dialog.c:424 #, c-format msgid "Path %d" msgstr "" -#: app/paths_dialog.c:1231 +#: app/paths_dialog.c:1241 msgid "Rename path" msgstr "" -#: app/paths_dialog.c:1234 +#: app/paths_dialog.c:1244 msgid "Enter a new name for the path" msgstr "" -#: app/paths_dialog.c:2216 +#: app/paths_dialog.c:2239 #, c-format msgid "Failed to read from %s" msgstr "" -#: app/paths_dialog.c:2231 +#: app/paths_dialog.c:2254 #, c-format msgid "Failed to read path from %s" msgstr "" -#: app/paths_dialog.c:2238 +#: app/paths_dialog.c:2261 #, c-format msgid "No points specified in path file %s" msgstr "" -#: app/paths_dialog.c:2249 +#: app/paths_dialog.c:2272 #, c-format msgid "Failed to read path points from %s" msgstr "" -#: app/paths_dialog.c:2328 app/xcf.c:418 +#: app/paths_dialog.c:2353 app/xcf.c:418 #, c-format msgid "open failed on %s: %s\n" msgstr "" -#: app/paths_dialog.c:2367 +#: app/paths_dialog.c:2392 msgid "Load/Store Bezier Curves" msgstr "" -#: app/paths_dialog.c:2399 +#: app/paths_dialog.c:2424 msgid "Load Path" msgstr "" -#: app/paths_dialog.c:2417 +#: app/paths_dialog.c:2442 msgid "Store Path" msgstr "" diff --git a/tools/pdbgen/pdb/color.pdb b/tools/pdbgen/pdb/color.pdb index 2486e9327b..bbc048e3f6 100644 --- a/tools/pdbgen/pdb/color.pdb +++ b/tools/pdbgen/pdb/color.pdb @@ -240,7 +240,7 @@ HELP headers => [ qw("desaturate.h") ], code => <<'CODE' { - if (gimp_drawable_color (drawable)) + if (gimp_drawable_is_rgb (drawable)) desaturate (drawable); else success = FALSE; @@ -360,7 +360,7 @@ HELP cd.drawable = drawable; cd.channel = channel; - cd.color = gimp_drawable_color (drawable); + cd.color = gimp_drawable_is_rgb (drawable); cd.curve_type = SMOOTH; for (j = 0; j < num_points / 2; j++) @@ -431,7 +431,7 @@ HELP cd.drawable = drawable; cd.channel = channel; - cd.color = gimp_drawable_color (drawable); + cd.color = gimp_drawable_is_rgb (drawable); for (j = 0; j < 256; j++) cd.curve[cd.channel][j] = curve[j]; @@ -599,7 +599,7 @@ HELP htd.shell = NULL; htd.channel = channel; htd.drawable = drawable; - htd.color = gimp_drawable_color (drawable); + htd.color = gimp_drawable_is_rgb (drawable); htd.histogram = histogram_widget_new (HISTOGRAM_WIDTH, HISTOGRAM_HEIGHT); @@ -735,7 +735,7 @@ HELP success = FALSE; else { - td.color = gimp_drawable_color (drawable); + td.color = gimp_drawable_is_rgb (drawable); td.low_threshold = low_threshold; td.high_threshold = high_threshold; diff --git a/tools/pdbgen/pdb/drawable.pdb b/tools/pdbgen/pdb/drawable.pdb index 18ffcd4065..d3ce138916 100644 --- a/tools/pdbgen/pdb/drawable.pdb +++ b/tools/pdbgen/pdb/drawable.pdb @@ -252,15 +252,15 @@ HELP "The drawable's type with alpha: { %%desc%% }"); } -sub drawable_color { +sub drawable_is_rgb { &drawable_type_proc('an RGB', 'RGB, RGBA', 'color'); } -sub drawable_gray { +sub drawable_is_gray { &drawable_type_proc('a grayscale', 'Gray, GrayA', 'gray'); } -sub drawable_indexed { +sub drawable_is_indexed { &drawable_type_proc('an indexed', 'Indexed, IndexedA', 'indexed'); } @@ -507,8 +507,8 @@ CODE @procs = qw(drawable_merge_shadow drawable_fill drawable_update drawable_mask_bounds drawable_image drawable_type - drawable_has_alpha drawable_type_with_alpha drawable_color - drawable_gray drawable_indexed drawable_bytes drawable_width + drawable_has_alpha drawable_type_with_alpha drawable_is_rgb + drawable_is_gray drawable_is_indexed drawable_bytes drawable_width drawable_height drawable_offsets drawable_layer drawable_layer_mask drawable_channel drawable_get_pixel drawable_set_pixel drawable_set_image drawable_thumbnail);