diff --git a/ChangeLog b/ChangeLog index 444a2c34e5..d5f7eaadf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2004-10-06 Michael Natterer + + * tools/pdbgen/pdb/brush.pdb: return the mask's bpp and the + brush's pixmap data if it has one. + + * tools/pdbgen/pdb/pattern.pdb: cleaned up. + + * tools/pdbgen/pdb/image.pdb: added $deprecated = 1 to deprecated + functions even if they are not exported to libgimp any more. + + * app/pdb/procedural_db.h (struct ProcRecord): added member + "gboolean deprecated". + + * tools/pdbgen/app.pl + * app/xcf/xcf.c: fill it accordingly. + + * app/plug-in/plug-in-message.c (plug_in_handle_proc_run): warn + not only for deprecated procedured which are in the compat hach + table, but also for procedures with deprecated flag set to TRUE. + + * app/pdb/*_cmds.c + * libgimp/gimpbrush_pdb.[ch] + * libgimp/gimppattern_pdb.[ch]: regenerated. + + * libgimp/gimpbrushmenu.c + * plug-ins/gfig/gfig-style.c: changed accordingly. + 2004-10-05 Manish Singh * tools/pdbgen/lib.pl: Fix array return value generation when there diff --git a/app/pdb/brush_cmds.c b/app/pdb/brush_cmds.c index 3d33d479d3..2b4c9b6a31 100644 --- a/app/pdb/brush_cmds.c +++ b/app/pdb/brush_cmds.c @@ -113,6 +113,7 @@ static ProcRecord brush_new_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_new_inargs, @@ -188,6 +189,7 @@ static ProcRecord brush_duplicate_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_duplicate_inargs, @@ -266,6 +268,7 @@ static ProcRecord brush_rename_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, brush_rename_inargs, @@ -331,6 +334,7 @@ static ProcRecord brush_delete_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_delete_inargs, @@ -368,6 +372,8 @@ brush_get_info_invoker (Gimp *gimp, { return_args[1].value.pdb_int = brush->mask->width; return_args[2].value.pdb_int = brush->mask->height; + return_args[3].value.pdb_int = brush->mask->bytes; + return_args[4].value.pdb_int = brush->pixmap ? brush->pixmap->bytes : 0; } return return_args; @@ -393,6 +399,16 @@ static ProcArg brush_get_info_outargs[] = GIMP_PDB_INT32, "height", "The brush height" + }, + { + GIMP_PDB_INT32, + "mask_bpp", + "The brush mask bpp" + }, + { + GIMP_PDB_INT32, + "color_bpp", + "The brush color bpp" } }; @@ -404,10 +420,11 @@ static ProcRecord brush_get_info_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_get_info_inargs, - 2, + 4, brush_get_info_outargs, { { brush_get_info_invoker } } }; @@ -421,8 +438,12 @@ brush_get_pixels_invoker (Gimp *gimp, gboolean success = TRUE; Argument *return_args; gchar *name; + gint32 mask_bpp = 0; gint32 num_mask_bytes = 0; guint8 *mask_bytes = NULL; + gint32 color_bpp = 0; + gint32 num_color_bytes = 0; + guint8 *color_bytes = NULL; GimpBrush *brush = NULL; name = (gchar *) args[0].value.pdb_pointer; @@ -436,8 +457,17 @@ brush_get_pixels_invoker (Gimp *gimp, if (brush) { + mask_bpp = brush->mask->bytes; num_mask_bytes = brush->mask->height * brush->mask->width; mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes); + + if (brush->pixmap) + { + color_bpp = brush->pixmap->bytes; + num_color_bytes = brush->pixmap->height * brush->pixmap->width; + color_bytes = g_memdup (temp_buf_data (brush->pixmap), + num_color_bytes); + } } else success = FALSE; @@ -449,8 +479,12 @@ brush_get_pixels_invoker (Gimp *gimp, { return_args[1].value.pdb_int = brush->mask->width; return_args[2].value.pdb_int = brush->mask->height; - return_args[3].value.pdb_int = num_mask_bytes; - return_args[4].value.pdb_pointer = mask_bytes; + return_args[3].value.pdb_int = mask_bpp; + return_args[4].value.pdb_int = num_mask_bytes; + return_args[5].value.pdb_pointer = mask_bytes; + return_args[6].value.pdb_int = color_bpp; + return_args[7].value.pdb_int = num_color_bytes; + return_args[8].value.pdb_pointer = color_bytes; } return return_args; @@ -477,6 +511,11 @@ static ProcArg brush_get_pixels_outargs[] = "height", "The brush height" }, + { + GIMP_PDB_INT32, + "mask_bpp", + "The brush mask bpp" + }, { GIMP_PDB_INT32, "num_mask_bytes", @@ -486,6 +525,21 @@ static ProcArg brush_get_pixels_outargs[] = GIMP_PDB_INT8ARRAY, "mask_bytes", "The brush mask data" + }, + { + GIMP_PDB_INT32, + "color_bpp", + "The brush color bpp" + }, + { + GIMP_PDB_INT32, + "num_color_bytes", + "Length of brush color data" + }, + { + GIMP_PDB_INT8ARRAY, + "color_bytes", + "The brush color data" } }; @@ -497,10 +551,11 @@ static ProcRecord brush_get_pixels_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_get_pixels_inargs, - 4, + 8, brush_get_pixels_outargs, { { brush_get_pixels_invoker } } }; @@ -562,6 +617,7 @@ static ProcRecord brush_get_spacing_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, brush_get_spacing_inargs, @@ -625,6 +681,7 @@ static ProcRecord brush_set_spacing_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, brush_set_spacing_inargs, diff --git a/app/pdb/brush_select_cmds.c b/app/pdb/brush_select_cmds.c index 18ec77eaab..2af836be2f 100644 --- a/app/pdb/brush_select_cmds.c +++ b/app/pdb/brush_select_cmds.c @@ -137,6 +137,7 @@ static ProcRecord brushes_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 6, brushes_popup_inargs, @@ -187,6 +188,7 @@ static ProcRecord brushes_close_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 1, brushes_close_popup_inargs, @@ -281,6 +283,7 @@ static ProcRecord brushes_set_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 5, brushes_set_popup_inargs, diff --git a/app/pdb/brushes_cmds.c b/app/pdb/brushes_cmds.c index 5d3041d2ee..55d2d4de18 100644 --- a/app/pdb/brushes_cmds.c +++ b/app/pdb/brushes_cmds.c @@ -72,6 +72,7 @@ static ProcRecord brushes_refresh_proc = "Seth Burgess", "Seth Burgess", "1997", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -141,6 +142,7 @@ static ProcRecord brushes_get_list_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, brushes_get_list_inargs, @@ -206,6 +208,7 @@ static ProcRecord brushes_get_brush_proc = "", "", "", + TRUE, GIMP_INTERNAL, 0, NULL, @@ -245,6 +248,7 @@ static ProcRecord brushes_get_spacing_proc = "", "", "", + TRUE, GIMP_INTERNAL, 0, NULL, @@ -289,6 +293,7 @@ static ProcRecord brushes_set_spacing_proc = "", "", "", + TRUE, GIMP_INTERNAL, 1, brushes_set_spacing_inargs, @@ -413,6 +418,7 @@ static ProcRecord brushes_get_brush_data_proc = "", "", "", + TRUE, GIMP_INTERNAL, 1, brushes_get_brush_data_inargs, diff --git a/app/pdb/channel_cmds.c b/app/pdb/channel_cmds.c index 724d571262..427b2b86af 100644 --- a/app/pdb/channel_cmds.c +++ b/app/pdb/channel_cmds.c @@ -162,6 +162,7 @@ static ProcRecord channel_new_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 6, channel_new_inargs, @@ -226,6 +227,7 @@ static ProcRecord channel_copy_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, channel_copy_inargs, @@ -308,6 +310,7 @@ static ProcRecord channel_combine_masks_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, channel_combine_masks_inargs, @@ -364,6 +367,7 @@ static ProcRecord channel_get_show_masked_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, channel_get_show_masked_inargs, @@ -416,6 +420,7 @@ static ProcRecord channel_set_show_masked_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, channel_set_show_masked_inargs, @@ -472,6 +477,7 @@ static ProcRecord channel_get_opacity_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, channel_get_opacity_inargs, @@ -526,6 +532,7 @@ static ProcRecord channel_set_opacity_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, channel_set_opacity_inargs, @@ -586,6 +593,7 @@ static ProcRecord channel_get_color_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, channel_get_color_inargs, @@ -643,6 +651,7 @@ static ProcRecord channel_set_color_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, channel_set_color_inargs, diff --git a/app/pdb/color_cmds.c b/app/pdb/color_cmds.c index ebd253eb86..5b94f2215d 100644 --- a/app/pdb/color_cmds.c +++ b/app/pdb/color_cmds.c @@ -169,6 +169,7 @@ static ProcRecord brightness_contrast_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 3, brightness_contrast_inargs, @@ -323,6 +324,7 @@ static ProcRecord levels_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, levels_inargs, @@ -413,6 +415,7 @@ static ProcRecord levels_auto_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, levels_auto_inargs, @@ -497,6 +500,7 @@ static ProcRecord posterize_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 2, posterize_inargs, @@ -546,6 +550,7 @@ static ProcRecord desaturate_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, desaturate_inargs, @@ -603,6 +608,7 @@ static ProcRecord equalize_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, equalize_inargs, @@ -652,6 +658,7 @@ static ProcRecord invert_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, invert_inargs, @@ -780,6 +787,7 @@ static ProcRecord curves_spline_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, curves_spline_inargs, @@ -899,6 +907,7 @@ static ProcRecord curves_explicit_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, curves_explicit_inargs, @@ -1029,6 +1038,7 @@ static ProcRecord color_balance_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 6, color_balance_inargs, @@ -1139,6 +1149,7 @@ static ProcRecord colorize_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "2004", + FALSE, GIMP_INTERNAL, 4, colorize_inargs, @@ -1295,6 +1306,7 @@ static ProcRecord histogram_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, histogram_inargs, @@ -1416,6 +1428,7 @@ static ProcRecord hue_saturation_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 5, hue_saturation_inargs, @@ -1507,6 +1520,7 @@ static ProcRecord threshold_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 3, threshold_inargs, diff --git a/app/pdb/context_cmds.c b/app/pdb/context_cmds.c index 977ae73b2a..b382cdd536 100644 --- a/app/pdb/context_cmds.c +++ b/app/pdb/context_cmds.c @@ -111,6 +111,7 @@ static ProcRecord context_push_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -145,6 +146,7 @@ static ProcRecord context_pop_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -187,6 +189,7 @@ static ProcRecord context_get_foreground_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -228,6 +231,7 @@ static ProcRecord context_set_foreground_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_foreground_inargs, @@ -270,6 +274,7 @@ static ProcRecord context_get_background_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -311,6 +316,7 @@ static ProcRecord context_set_background_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_background_inargs, @@ -337,6 +343,7 @@ static ProcRecord context_set_default_colors_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -363,6 +370,7 @@ static ProcRecord context_swap_colors_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -402,6 +410,7 @@ static ProcRecord context_get_opacity_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -446,6 +455,7 @@ static ProcRecord context_set_opacity_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_opacity_inargs, @@ -485,6 +495,7 @@ static ProcRecord context_get_paint_mode_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -529,6 +540,7 @@ static ProcRecord context_set_paint_mode_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_paint_mode_inargs, @@ -574,6 +586,7 @@ static ProcRecord context_get_brush_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -627,6 +640,7 @@ static ProcRecord context_set_brush_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_brush_inargs, @@ -672,6 +686,7 @@ static ProcRecord context_get_pattern_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -725,6 +740,7 @@ static ProcRecord context_set_pattern_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_pattern_inargs, @@ -770,6 +786,7 @@ static ProcRecord context_get_gradient_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -823,6 +840,7 @@ static ProcRecord context_set_gradient_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_gradient_inargs, @@ -868,6 +886,7 @@ static ProcRecord context_get_palette_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -921,6 +940,7 @@ static ProcRecord context_set_palette_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_palette_inargs, @@ -966,6 +986,7 @@ static ProcRecord context_get_font_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -1019,6 +1040,7 @@ static ProcRecord context_set_font_proc = "Michael Natterer & Sven Neumann ", "Michael Natterer & Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 1, context_set_font_inargs, diff --git a/app/pdb/convert_cmds.c b/app/pdb/convert_cmds.c index f280956df3..d1879b54d4 100644 --- a/app/pdb/convert_cmds.c +++ b/app/pdb/convert_cmds.c @@ -86,6 +86,7 @@ static ProcRecord image_convert_rgb_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_convert_rgb_inargs, @@ -135,6 +136,7 @@ static ProcRecord image_convert_grayscale_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_convert_grayscale_inargs, @@ -271,6 +273,7 @@ static ProcRecord image_convert_indexed_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, image_convert_indexed_inargs, diff --git a/app/pdb/display_cmds.c b/app/pdb/display_cmds.c index 9706073fec..ab84d2394c 100644 --- a/app/pdb/display_cmds.c +++ b/app/pdb/display_cmds.c @@ -104,6 +104,7 @@ static ProcRecord display_new_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, display_new_inargs, @@ -148,6 +149,7 @@ static ProcRecord display_delete_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, display_delete_inargs, @@ -174,6 +176,7 @@ static ProcRecord displays_flush_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -228,6 +231,7 @@ static ProcRecord displays_reconnect_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, displays_reconnect_inargs, diff --git a/app/pdb/drawable_cmds.c b/app/pdb/drawable_cmds.c index a2571cd497..8fe93633bf 100644 --- a/app/pdb/drawable_cmds.c +++ b/app/pdb/drawable_cmds.c @@ -150,6 +150,7 @@ static ProcRecord drawable_delete_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_delete_inargs, @@ -206,6 +207,7 @@ static ProcRecord drawable_is_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_layer_inargs, @@ -262,6 +264,7 @@ static ProcRecord drawable_is_layer_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_layer_mask_inargs, @@ -318,6 +321,7 @@ static ProcRecord drawable_is_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_channel_inargs, @@ -374,6 +378,7 @@ static ProcRecord drawable_type_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_type_inargs, @@ -430,6 +435,7 @@ static ProcRecord drawable_type_with_alpha_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_type_with_alpha_inargs, @@ -486,6 +492,7 @@ static ProcRecord drawable_has_alpha_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_has_alpha_inargs, @@ -542,6 +549,7 @@ static ProcRecord drawable_is_rgb_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_rgb_inargs, @@ -598,6 +606,7 @@ static ProcRecord drawable_is_gray_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_gray_inargs, @@ -654,6 +663,7 @@ static ProcRecord drawable_is_indexed_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_is_indexed_inargs, @@ -710,6 +720,7 @@ static ProcRecord drawable_bpp_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_bpp_inargs, @@ -766,6 +777,7 @@ static ProcRecord drawable_width_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_width_inargs, @@ -822,6 +834,7 @@ static ProcRecord drawable_height_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_height_inargs, @@ -891,6 +904,7 @@ static ProcRecord drawable_offsets_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_offsets_inargs, @@ -951,6 +965,7 @@ static ProcRecord drawable_get_image_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_get_image_inargs, @@ -1005,6 +1020,7 @@ static ProcRecord drawable_set_image_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, drawable_set_image_inargs, @@ -1061,6 +1077,7 @@ static ProcRecord drawable_get_name_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_get_name_inargs, @@ -1115,6 +1132,7 @@ static ProcRecord drawable_set_name_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, drawable_set_name_inargs, @@ -1171,6 +1189,7 @@ static ProcRecord drawable_get_visible_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_get_visible_inargs, @@ -1223,6 +1242,7 @@ static ProcRecord drawable_set_visible_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, drawable_set_visible_inargs, @@ -1279,6 +1299,7 @@ static ProcRecord drawable_get_linked_proc = "Wolfgang Hofer", "Wolfgang Hofer", "1998", + FALSE, GIMP_INTERNAL, 1, drawable_get_linked_inargs, @@ -1331,6 +1352,7 @@ static ProcRecord drawable_set_linked_proc = "Wolfgang Hofer", "Wolfgang Hofer", "1998", + FALSE, GIMP_INTERNAL, 2, drawable_set_linked_inargs, @@ -1387,6 +1409,7 @@ static ProcRecord drawable_get_tattoo_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 1, drawable_get_tattoo_inargs, @@ -1441,6 +1464,7 @@ static ProcRecord drawable_set_tattoo_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, drawable_set_tattoo_inargs, @@ -1531,6 +1555,7 @@ static ProcRecord drawable_mask_bounds_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, drawable_mask_bounds_inargs, @@ -1594,6 +1619,7 @@ static ProcRecord drawable_merge_shadow_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, drawable_merge_shadow_inargs, @@ -1670,6 +1696,7 @@ static ProcRecord drawable_update_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, drawable_update_inargs, @@ -1783,6 +1810,7 @@ static ProcRecord drawable_get_pixel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 3, drawable_get_pixel_inargs, @@ -1885,6 +1913,7 @@ static ProcRecord drawable_set_pixel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 5, drawable_set_pixel_inargs, @@ -1939,6 +1968,7 @@ static ProcRecord drawable_fill_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, drawable_fill_inargs, @@ -2020,6 +2050,7 @@ static ProcRecord drawable_offset_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 5, drawable_offset_inargs, @@ -2167,6 +2198,7 @@ static ProcRecord drawable_thumbnail_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, drawable_thumbnail_inargs, diff --git a/app/pdb/edit_cmds.c b/app/pdb/edit_cmds.c index 962f11c4a0..a20c224476 100644 --- a/app/pdb/edit_cmds.c +++ b/app/pdb/edit_cmds.c @@ -117,6 +117,7 @@ static ProcRecord edit_cut_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, edit_cut_inargs, @@ -181,6 +182,7 @@ static ProcRecord edit_copy_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, edit_copy_inargs, @@ -261,6 +263,7 @@ static ProcRecord edit_paste_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, edit_paste_inargs, @@ -309,6 +312,7 @@ static ProcRecord edit_clear_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, edit_clear_inargs, @@ -367,6 +371,7 @@ static ProcRecord edit_fill_proc = "Spencer Kimball & Peter Mattis & Raphael Quinet", "Spencer Kimball & Peter Mattis", "1995-2000", + FALSE, GIMP_INTERNAL, 2, edit_fill_inargs, @@ -494,6 +499,7 @@ static ProcRecord edit_bucket_fill_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 8, edit_bucket_fill_inargs, @@ -699,6 +705,7 @@ static ProcRecord edit_blend_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 16, edit_blend_inargs, @@ -755,6 +762,7 @@ static ProcRecord edit_stroke_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, edit_stroke_inargs, diff --git a/app/pdb/fileops_cmds.c b/app/pdb/fileops_cmds.c index 495e7d6f0b..6008f0eb11 100644 --- a/app/pdb/fileops_cmds.c +++ b/app/pdb/fileops_cmds.c @@ -157,6 +157,7 @@ static ProcRecord file_load_proc = "Josh MacDonald", "Josh MacDonald", "1997", + FALSE, GIMP_INTERNAL, 3, file_load_inargs, @@ -245,6 +246,7 @@ static ProcRecord file_save_proc = "Josh MacDonald", "Josh MacDonald", "1997", + FALSE, GIMP_INTERNAL, 5, file_save_inargs, @@ -377,6 +379,7 @@ static ProcRecord file_load_thumbnail_proc = "Adam D. Moss, Sven Neumann", "Adam D. Moss, Sven Neumann", "1999-2003", + FALSE, GIMP_INTERNAL, 1, file_load_thumbnail_inargs, @@ -460,6 +463,7 @@ static ProcRecord file_save_thumbnail_proc = "Josh MacDonald", "Josh MacDonald", "1997", + FALSE, GIMP_INTERNAL, 2, file_save_thumbnail_inargs, @@ -538,6 +542,7 @@ static ProcRecord temp_name_proc = "Josh MacDonald", "Josh MacDonald", "1997", + FALSE, GIMP_INTERNAL, 1, temp_name_inargs, @@ -641,6 +646,7 @@ static ProcRecord register_magic_load_handler_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, register_magic_load_handler_inargs, @@ -694,6 +700,7 @@ static ProcRecord register_load_handler_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, register_load_handler_inargs, @@ -789,6 +796,7 @@ static ProcRecord register_save_handler_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, register_save_handler_inargs, @@ -845,6 +853,7 @@ static ProcRecord register_file_handler_mime_proc = "Sven Neumann", "Sven Neumann", "2004", + FALSE, GIMP_INTERNAL, 2, register_file_handler_mime_inargs, diff --git a/app/pdb/floating_sel_cmds.c b/app/pdb/floating_sel_cmds.c index 48a1333fe1..5fd7836d48 100644 --- a/app/pdb/floating_sel_cmds.c +++ b/app/pdb/floating_sel_cmds.c @@ -89,6 +89,7 @@ static ProcRecord floating_sel_remove_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, floating_sel_remove_inargs, @@ -138,6 +139,7 @@ static ProcRecord floating_sel_anchor_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, floating_sel_anchor_inargs, @@ -187,6 +189,7 @@ static ProcRecord floating_sel_to_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, floating_sel_to_layer_inargs, @@ -246,6 +249,7 @@ static ProcRecord floating_sel_attach_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, floating_sel_attach_inargs, @@ -303,6 +307,7 @@ static ProcRecord floating_sel_rigor_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, floating_sel_rigor_inargs, @@ -360,6 +365,7 @@ static ProcRecord floating_sel_relax_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, floating_sel_relax_inargs, diff --git a/app/pdb/font_select_cmds.c b/app/pdb/font_select_cmds.c index 1b0703c63e..d9ca44c2ee 100644 --- a/app/pdb/font_select_cmds.c +++ b/app/pdb/font_select_cmds.c @@ -103,6 +103,7 @@ static ProcRecord fonts_popup_proc = "Sven Neumann ", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 3, fonts_popup_inargs, @@ -152,6 +153,7 @@ static ProcRecord fonts_close_popup_proc = "Sven Neumann ", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 1, fonts_close_popup_inargs, @@ -212,6 +214,7 @@ static ProcRecord fonts_set_popup_proc = "Sven Neumann ", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 2, fonts_set_popup_inargs, diff --git a/app/pdb/fonts_cmds.c b/app/pdb/fonts_cmds.c index bfd070f3e9..41e939b74f 100644 --- a/app/pdb/fonts_cmds.c +++ b/app/pdb/fonts_cmds.c @@ -59,6 +59,7 @@ static ProcRecord fonts_refresh_proc = "Sven Neumann", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -128,6 +129,7 @@ static ProcRecord fonts_get_list_proc = "Sven Neumann", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 1, fonts_get_list_inargs, diff --git a/app/pdb/gimp-pdb.h b/app/pdb/gimp-pdb.h index 7ef3f81c88..e0f8b2b68a 100644 --- a/app/pdb/gimp-pdb.h +++ b/app/pdb/gimp-pdb.h @@ -98,6 +98,8 @@ struct _ProcRecord gchar *copyright; /* Copyright field */ gchar *date; /* Date field */ + gboolean deprecated; /* Is the procedure deprecated? */ + /* Procedure type */ GimpPDBProcType proc_type; /* Type of procedure--Internal, Plug-In, Extension */ diff --git a/app/pdb/gimppdb.h b/app/pdb/gimppdb.h index 7ef3f81c88..e0f8b2b68a 100644 --- a/app/pdb/gimppdb.h +++ b/app/pdb/gimppdb.h @@ -98,6 +98,8 @@ struct _ProcRecord gchar *copyright; /* Copyright field */ gchar *date; /* Date field */ + gboolean deprecated; /* Is the procedure deprecated? */ + /* Procedure type */ GimpPDBProcType proc_type; /* Type of procedure--Internal, Plug-In, Extension */ diff --git a/app/pdb/gimpprocedure.h b/app/pdb/gimpprocedure.h index 7ef3f81c88..e0f8b2b68a 100644 --- a/app/pdb/gimpprocedure.h +++ b/app/pdb/gimpprocedure.h @@ -98,6 +98,8 @@ struct _ProcRecord gchar *copyright; /* Copyright field */ gchar *date; /* Date field */ + gboolean deprecated; /* Is the procedure deprecated? */ + /* Procedure type */ GimpPDBProcType proc_type; /* Type of procedure--Internal, Plug-In, Extension */ diff --git a/app/pdb/gimprc_cmds.c b/app/pdb/gimprc_cmds.c index 3cbf1e8487..22c406006f 100644 --- a/app/pdb/gimprc_cmds.c +++ b/app/pdb/gimprc_cmds.c @@ -114,6 +114,7 @@ static ProcRecord gimprc_query_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, gimprc_query_inargs, @@ -176,6 +177,7 @@ static ProcRecord gimprc_set_proc = "Seth Burgess", "Seth Burgess", "1999", + FALSE, GIMP_INTERNAL, 2, gimprc_set_inargs, @@ -218,6 +220,7 @@ static ProcRecord get_default_comment_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -269,6 +272,7 @@ static ProcRecord get_monitor_resolution_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -311,6 +315,7 @@ static ProcRecord get_theme_dir_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -353,6 +358,7 @@ static ProcRecord get_module_load_inhibit_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, diff --git a/app/pdb/gradient_cmds.c b/app/pdb/gradient_cmds.c index 0dc819ec92..4ad3fc79a8 100644 --- a/app/pdb/gradient_cmds.c +++ b/app/pdb/gradient_cmds.c @@ -157,6 +157,7 @@ static ProcRecord gradient_new_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 1, gradient_new_inargs, @@ -232,6 +233,7 @@ static ProcRecord gradient_duplicate_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 1, gradient_duplicate_inargs, @@ -310,6 +312,7 @@ static ProcRecord gradient_rename_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_rename_inargs, @@ -375,6 +378,7 @@ static ProcRecord gradient_delete_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 1, gradient_delete_inargs, @@ -493,6 +497,7 @@ static ProcRecord gradient_get_uniform_samples_proc = "Federico Mena Quintero", "Federico Mena Quintero", "1997", + FALSE, GIMP_INTERNAL, 3, gradient_get_uniform_samples_inargs, @@ -617,6 +622,7 @@ static ProcRecord gradient_get_custom_samples_proc = "Federico Mena Quintero", "Federico Mena Quintero", "1997", + FALSE, GIMP_INTERNAL, 4, gradient_get_custom_samples_inargs, @@ -717,6 +723,7 @@ static ProcRecord gradient_segment_get_left_color_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_left_color_inargs, @@ -810,6 +817,7 @@ static ProcRecord gradient_segment_set_left_color_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_set_left_color_inargs, @@ -910,6 +918,7 @@ static ProcRecord gradient_segment_get_right_color_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_right_color_inargs, @@ -1003,6 +1012,7 @@ static ProcRecord gradient_segment_set_right_color_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_set_right_color_inargs, @@ -1093,6 +1103,7 @@ static ProcRecord gradient_segment_get_left_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_left_pos_inargs, @@ -1194,6 +1205,7 @@ static ProcRecord gradient_segment_set_left_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_set_left_pos_inargs, @@ -1284,6 +1296,7 @@ static ProcRecord gradient_segment_get_middle_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_middle_pos_inargs, @@ -1385,6 +1398,7 @@ static ProcRecord gradient_segment_set_middle_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_set_middle_pos_inargs, @@ -1475,6 +1489,7 @@ static ProcRecord gradient_segment_get_right_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_right_pos_inargs, @@ -1576,6 +1591,7 @@ static ProcRecord gradient_segment_set_right_pos_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_set_right_pos_inargs, @@ -1667,6 +1683,7 @@ static ProcRecord gradient_segment_get_blending_function_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_blending_function_inargs, @@ -1758,6 +1775,7 @@ static ProcRecord gradient_segment_get_coloring_type_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 2, gradient_segment_get_coloring_type_inargs, @@ -1872,6 +1890,7 @@ static ProcRecord gradient_segment_range_set_blending_function_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_range_set_blending_function_inargs, @@ -1986,6 +2005,7 @@ static ProcRecord gradient_segment_range_set_coloring_type_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_range_set_coloring_type_inargs, @@ -2090,6 +2110,7 @@ static ProcRecord gradient_segment_range_flip_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_flip_inargs, @@ -2205,6 +2226,7 @@ static ProcRecord gradient_segment_range_replicate_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_range_replicate_inargs, @@ -2309,6 +2331,7 @@ static ProcRecord gradient_segment_range_split_midpoint_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_split_midpoint_inargs, @@ -2424,6 +2447,7 @@ static ProcRecord gradient_segment_range_split_uniform_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 4, gradient_segment_range_split_uniform_inargs, @@ -2528,6 +2552,7 @@ static ProcRecord gradient_segment_range_delete_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_delete_inargs, @@ -2631,6 +2656,7 @@ static ProcRecord gradient_segment_range_redistribute_handles_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_redistribute_handles_inargs, @@ -2736,6 +2762,7 @@ static ProcRecord gradient_segment_range_blend_colors_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_blend_colors_inargs, @@ -2841,6 +2868,7 @@ static ProcRecord gradient_segment_range_blend_opacity_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 3, gradient_segment_range_blend_opacity_inargs, @@ -2981,6 +3009,7 @@ static ProcRecord gradient_segment_range_move_proc = "Shlomi Fish", "Shlomi Fish", "2003", + FALSE, GIMP_INTERNAL, 5, gradient_segment_range_move_inargs, diff --git a/app/pdb/gradient_select_cmds.c b/app/pdb/gradient_select_cmds.c index af1e7f96e4..f84fec99b1 100644 --- a/app/pdb/gradient_select_cmds.c +++ b/app/pdb/gradient_select_cmds.c @@ -116,6 +116,7 @@ static ProcRecord gradients_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 4, gradients_popup_inargs, @@ -166,6 +167,7 @@ static ProcRecord gradients_close_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 1, gradients_close_popup_inargs, @@ -227,6 +229,7 @@ static ProcRecord gradients_set_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 2, gradients_set_popup_inargs, diff --git a/app/pdb/gradients_cmds.c b/app/pdb/gradients_cmds.c index 782f20e565..0d3b043b5a 100644 --- a/app/pdb/gradients_cmds.c +++ b/app/pdb/gradients_cmds.c @@ -69,6 +69,7 @@ static ProcRecord gradients_refresh_proc = "Michael Natterer", "Michael Natterer", "2002", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -138,6 +139,7 @@ static ProcRecord gradients_get_list_proc = "Federico Mena Quintero", "Federico Mena Quintero", "1997", + FALSE, GIMP_INTERNAL, 1, gradients_get_list_inargs, @@ -240,6 +242,7 @@ static ProcRecord gradients_sample_uniform_proc = "", "", "", + TRUE, GIMP_INTERNAL, 2, gradients_sample_uniform_inargs, @@ -346,6 +349,7 @@ static ProcRecord gradients_sample_custom_proc = "", "", "", + TRUE, GIMP_INTERNAL, 3, gradients_sample_custom_inargs, @@ -478,6 +482,7 @@ static ProcRecord gradients_get_gradient_data_proc = "", "", "", + TRUE, GIMP_INTERNAL, 3, gradients_get_gradient_data_inargs, diff --git a/app/pdb/guides_cmds.c b/app/pdb/guides_cmds.c index 478bdbcd57..cc1fdc0f10 100644 --- a/app/pdb/guides_cmds.c +++ b/app/pdb/guides_cmds.c @@ -119,6 +119,7 @@ static ProcRecord image_add_hguide_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_add_hguide_inargs, @@ -198,6 +199,7 @@ static ProcRecord image_add_vguide_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_add_vguide_inargs, @@ -265,6 +267,7 @@ static ProcRecord image_delete_guide_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_delete_guide_inargs, @@ -371,6 +374,7 @@ static ProcRecord image_find_next_guide_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_find_next_guide_inargs, @@ -455,6 +459,7 @@ static ProcRecord image_get_guide_orientation_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_get_guide_orientation_inargs, @@ -539,6 +544,7 @@ static ProcRecord image_get_guide_position_proc = "Adam D. Moss", "Adam D. Moss", "1998", + FALSE, GIMP_INTERNAL, 2, image_get_guide_position_inargs, diff --git a/app/pdb/help_cmds.c b/app/pdb/help_cmds.c index 65b1e7adcf..c11d4ae6d5 100644 --- a/app/pdb/help_cmds.c +++ b/app/pdb/help_cmds.c @@ -90,6 +90,7 @@ static ProcRecord help_proc = "Michael Natterer ", "Michael Natterer ", "2000", + FALSE, GIMP_INTERNAL, 2, help_inargs, diff --git a/app/pdb/image_cmds.c b/app/pdb/image_cmds.c index 533b05ff2e..1a105b477b 100644 --- a/app/pdb/image_cmds.c +++ b/app/pdb/image_cmds.c @@ -243,6 +243,7 @@ static ProcRecord image_list_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -326,6 +327,7 @@ static ProcRecord image_new_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_new_inargs, @@ -386,6 +388,7 @@ static ProcRecord image_duplicate_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, image_duplicate_inargs, @@ -435,6 +438,7 @@ static ProcRecord image_delete_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_delete_inargs, @@ -495,6 +499,7 @@ static ProcRecord image_base_type_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_base_type_inargs, @@ -551,6 +556,7 @@ static ProcRecord image_width_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_width_inargs, @@ -607,6 +613,7 @@ static ProcRecord image_height_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_height_inargs, @@ -651,6 +658,7 @@ static ProcRecord image_free_shadow_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_free_shadow_inargs, @@ -734,6 +742,7 @@ static ProcRecord image_resize_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, image_resize_inargs, @@ -780,6 +789,7 @@ static ProcRecord image_resize_to_layers_proc = "Simon Budig", "Simon Budig", "2004", + FALSE, GIMP_INTERNAL, 1, image_resize_to_layers_inargs, @@ -848,6 +858,7 @@ static ProcRecord image_scale_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_scale_inargs, @@ -942,6 +953,7 @@ static ProcRecord image_crop_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, image_crop_inargs, @@ -998,6 +1010,7 @@ static ProcRecord image_flip_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_flip_inargs, @@ -1054,6 +1067,7 @@ static ProcRecord image_rotate_proc = "Michael Natterer", "Michael Natterer", "2003", + FALSE, GIMP_INTERNAL, 2, image_rotate_inargs, @@ -1135,6 +1149,7 @@ static ProcRecord image_get_layers_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_layers_inargs, @@ -1216,6 +1231,7 @@ static ProcRecord image_get_channels_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_channels_inargs, @@ -1276,6 +1292,7 @@ static ProcRecord image_get_active_drawable_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_active_drawable_inargs, @@ -1320,6 +1337,7 @@ static ProcRecord image_unset_active_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_unset_active_channel_inargs, @@ -1380,6 +1398,7 @@ static ProcRecord image_get_floating_sel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_floating_sel_inargs, @@ -1448,6 +1467,7 @@ static ProcRecord image_floating_sel_attached_to_proc = "Wolfgang Hofer", "Wolfgang Hofer", "1998", + FALSE, GIMP_INTERNAL, 1, image_floating_sel_attached_to_inargs, @@ -1573,6 +1593,7 @@ static ProcRecord image_pick_color_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, image_pick_color_inargs, @@ -1649,6 +1670,7 @@ static ProcRecord image_pick_correlate_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_pick_correlate_layer_inargs, @@ -1721,6 +1743,7 @@ static ProcRecord image_add_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_add_layer_inargs, @@ -1775,6 +1798,7 @@ static ProcRecord image_remove_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_remove_layer_inargs, @@ -1829,6 +1853,7 @@ static ProcRecord image_raise_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_raise_layer_inargs, @@ -1883,6 +1908,7 @@ static ProcRecord image_lower_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_lower_layer_inargs, @@ -1937,6 +1963,7 @@ static ProcRecord image_raise_layer_to_top_proc = "Wolfgang Hofer, Sven Neumann", "Wolfgang Hofer", "1998", + FALSE, GIMP_INTERNAL, 2, image_raise_layer_to_top_inargs, @@ -1991,6 +2018,7 @@ static ProcRecord image_lower_layer_to_bottom_proc = "Wolfgang Hofer, Sven Neumann", "Wolfgang Hofer", "1998", + FALSE, GIMP_INTERNAL, 2, image_lower_layer_to_bottom_inargs, @@ -2053,6 +2081,7 @@ static ProcRecord image_add_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_add_channel_inargs, @@ -2107,6 +2136,7 @@ static ProcRecord image_remove_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_remove_channel_inargs, @@ -2161,6 +2191,7 @@ static ProcRecord image_raise_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_raise_channel_inargs, @@ -2215,6 +2246,7 @@ static ProcRecord image_lower_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_lower_channel_inargs, @@ -2275,6 +2307,7 @@ static ProcRecord image_flatten_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_flatten_inargs, @@ -2348,6 +2381,7 @@ static ProcRecord image_merge_visible_layers_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_merge_visible_layers_inargs, @@ -2431,6 +2465,7 @@ static ProcRecord image_merge_down_proc = "Larry Ewing", "Larry Ewing", "1998", + FALSE, GIMP_INTERNAL, 3, image_merge_down_inargs, @@ -2497,6 +2532,7 @@ static ProcRecord image_add_layer_mask_proc = "", "", "", + TRUE, GIMP_INTERNAL, 3, image_add_layer_mask_inargs, @@ -2561,6 +2597,7 @@ static ProcRecord image_remove_layer_mask_proc = "", "", "", + TRUE, GIMP_INTERNAL, 3, image_remove_layer_mask_inargs, @@ -2633,6 +2670,7 @@ static ProcRecord image_get_cmap_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_cmap_inargs, @@ -2695,6 +2733,7 @@ static ProcRecord image_set_cmap_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_set_cmap_inargs, @@ -2739,6 +2778,7 @@ static ProcRecord image_clean_all_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_clean_all_inargs, @@ -2799,6 +2839,7 @@ static ProcRecord image_is_dirty_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_is_dirty_inargs, @@ -2947,6 +2988,7 @@ static ProcRecord image_thumbnail_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, image_thumbnail_inargs, @@ -3007,6 +3049,7 @@ static ProcRecord image_get_active_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_active_layer_inargs, @@ -3061,6 +3104,7 @@ static ProcRecord image_set_active_layer_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_set_active_layer_inargs, @@ -3121,6 +3165,7 @@ static ProcRecord image_get_active_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_active_channel_inargs, @@ -3175,6 +3220,7 @@ static ProcRecord image_set_active_channel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_set_active_channel_inargs, @@ -3235,6 +3281,7 @@ static ProcRecord image_get_selection_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_selection_inargs, @@ -3311,6 +3358,7 @@ static ProcRecord image_get_component_active_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_get_component_active_inargs, @@ -3383,6 +3431,7 @@ static ProcRecord image_set_component_active_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_set_component_active_inargs, @@ -3459,6 +3508,7 @@ static ProcRecord image_get_component_visible_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_get_component_visible_inargs, @@ -3531,6 +3581,7 @@ static ProcRecord image_set_component_visible_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, image_set_component_visible_inargs, @@ -3587,6 +3638,7 @@ static ProcRecord image_get_filename_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_filename_inargs, @@ -3641,6 +3693,7 @@ static ProcRecord image_set_filename_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, image_set_filename_inargs, @@ -3714,6 +3767,7 @@ static ProcRecord image_get_name_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_get_name_inargs, @@ -3778,6 +3832,7 @@ static ProcRecord image_get_resolution_proc = "Austin Donnelly", "Austin Donnelly", "1998", + FALSE, GIMP_INTERNAL, 1, image_get_resolution_inargs, @@ -3852,6 +3907,7 @@ static ProcRecord image_set_resolution_proc = "Austin Donnelly", "Austin Donnelly", "1998", + FALSE, GIMP_INTERNAL, 3, image_set_resolution_inargs, @@ -3908,6 +3964,7 @@ static ProcRecord image_get_unit_proc = "Michael Natterer", "Michael Natterer", "1998", + FALSE, GIMP_INTERNAL, 1, image_get_unit_inargs, @@ -3962,6 +4019,7 @@ static ProcRecord image_set_unit_proc = "Michael Natterer", "Michael Natterer", "1998", + FALSE, GIMP_INTERNAL, 2, image_set_unit_inargs, @@ -4018,6 +4076,7 @@ static ProcRecord image_get_tattoo_state_proc = "Andy Thomas", "Andy Thomas", "2000", + FALSE, GIMP_INTERNAL, 1, image_get_tattoo_state_inargs, @@ -4070,6 +4129,7 @@ static ProcRecord image_set_tattoo_state_proc = "Andy Thomas", "Andy Thomas", "2000", + FALSE, GIMP_INTERNAL, 2, image_set_tattoo_state_inargs, @@ -4143,6 +4203,7 @@ static ProcRecord image_get_layer_by_tattoo_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, image_get_layer_by_tattoo_inargs, @@ -4216,6 +4277,7 @@ static ProcRecord image_get_channel_by_tattoo_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, image_get_channel_by_tattoo_inargs, diff --git a/app/pdb/layer_cmds.c b/app/pdb/layer_cmds.c index 163964cfe8..67f314e08d 100644 --- a/app/pdb/layer_cmds.c +++ b/app/pdb/layer_cmds.c @@ -214,6 +214,7 @@ static ProcRecord layer_new_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, layer_new_inargs, @@ -302,6 +303,7 @@ static ProcRecord layer_new_from_drawable_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_new_from_drawable_inargs, @@ -370,6 +372,7 @@ static ProcRecord layer_copy_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_copy_inargs, @@ -414,6 +417,7 @@ static ProcRecord layer_add_alpha_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_add_alpha_inargs, @@ -486,6 +490,7 @@ static ProcRecord layer_scale_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, layer_scale_inargs, @@ -566,6 +571,7 @@ static ProcRecord layer_resize_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, layer_resize_inargs, @@ -615,6 +621,7 @@ static ProcRecord layer_resize_to_image_size_proc = "Manish Singh", "Manish Singh", "2003", + FALSE, GIMP_INTERNAL, 1, layer_resize_to_image_size_inargs, @@ -693,6 +700,7 @@ static ProcRecord layer_translate_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, layer_translate_inargs, @@ -771,6 +779,7 @@ static ProcRecord layer_set_offsets_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, layer_set_offsets_inargs, @@ -841,6 +850,7 @@ static ProcRecord layer_create_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_create_mask_inargs, @@ -897,6 +907,7 @@ static ProcRecord layer_get_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_mask_inargs, @@ -953,6 +964,7 @@ static ProcRecord layer_add_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_add_mask_inargs, @@ -1007,6 +1019,7 @@ static ProcRecord layer_remove_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_remove_mask_inargs, @@ -1063,6 +1076,7 @@ static ProcRecord layer_is_floating_sel_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_is_floating_sel_inargs, @@ -1119,6 +1133,7 @@ static ProcRecord layer_get_preserve_trans_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_preserve_trans_inargs, @@ -1171,6 +1186,7 @@ static ProcRecord layer_set_preserve_trans_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_preserve_trans_inargs, @@ -1227,6 +1243,7 @@ static ProcRecord layer_get_apply_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_apply_mask_inargs, @@ -1279,6 +1296,7 @@ static ProcRecord layer_set_apply_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_apply_mask_inargs, @@ -1335,6 +1353,7 @@ static ProcRecord layer_get_show_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_show_mask_inargs, @@ -1387,6 +1406,7 @@ static ProcRecord layer_set_show_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_show_mask_inargs, @@ -1443,6 +1463,7 @@ static ProcRecord layer_get_edit_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_edit_mask_inargs, @@ -1495,6 +1516,7 @@ static ProcRecord layer_set_edit_mask_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_edit_mask_inargs, @@ -1551,6 +1573,7 @@ static ProcRecord layer_get_opacity_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_opacity_inargs, @@ -1605,6 +1628,7 @@ static ProcRecord layer_set_opacity_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_opacity_inargs, @@ -1661,6 +1685,7 @@ static ProcRecord layer_get_mode_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, layer_get_mode_inargs, @@ -1715,6 +1740,7 @@ static ProcRecord layer_set_mode_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, layer_set_mode_inargs, diff --git a/app/pdb/message_cmds.c b/app/pdb/message_cmds.c index 525ba64bc3..409873493d 100644 --- a/app/pdb/message_cmds.c +++ b/app/pdb/message_cmds.c @@ -88,6 +88,7 @@ static ProcRecord message_proc = "Manish Singh", "Manish Singh", "1998", + FALSE, GIMP_INTERNAL, 1, message_inargs, @@ -127,6 +128,7 @@ static ProcRecord message_get_handler_proc = "Manish Singh", "Manish Singh", "1998", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -171,6 +173,7 @@ static ProcRecord message_set_handler_proc = "Manish Singh", "Manish Singh", "1998", + FALSE, GIMP_INTERNAL, 1, message_set_handler_inargs, diff --git a/app/pdb/misc_cmds.c b/app/pdb/misc_cmds.c index 7cc170805d..52601a7df5 100644 --- a/app/pdb/misc_cmds.c +++ b/app/pdb/misc_cmds.c @@ -71,6 +71,7 @@ static ProcRecord version_proc = "Manish Singh", "Manish Singh", "1999", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -111,6 +112,7 @@ static ProcRecord quit_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, quit_inargs, diff --git a/app/pdb/paint_tools_cmds.c b/app/pdb/paint_tools_cmds.c index 73732e2428..27d11c75cf 100644 --- a/app/pdb/paint_tools_cmds.c +++ b/app/pdb/paint_tools_cmds.c @@ -197,6 +197,7 @@ static ProcRecord airbrush_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, airbrush_inargs, @@ -271,6 +272,7 @@ static ProcRecord airbrush_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, airbrush_default_inargs, @@ -396,6 +398,7 @@ static ProcRecord clone_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, clone_inargs, @@ -470,6 +473,7 @@ static ProcRecord clone_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, clone_default_inargs, @@ -569,6 +573,7 @@ static ProcRecord convolve_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, convolve_inargs, @@ -643,6 +648,7 @@ static ProcRecord convolve_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, convolve_default_inargs, @@ -753,6 +759,7 @@ static ProcRecord dodgeburn_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 6, dodgeburn_inargs, @@ -827,6 +834,7 @@ static ProcRecord dodgeburn_default_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, dodgeburn_default_inargs, @@ -926,6 +934,7 @@ static ProcRecord eraser_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, eraser_inargs, @@ -1000,6 +1009,7 @@ static ProcRecord eraser_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, eraser_default_inargs, @@ -1112,6 +1122,7 @@ static ProcRecord paintbrush_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 6, paintbrush_inargs, @@ -1186,6 +1197,7 @@ static ProcRecord paintbrush_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, paintbrush_default_inargs, @@ -1260,6 +1272,7 @@ static ProcRecord pencil_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, pencil_inargs, @@ -1348,6 +1361,7 @@ static ProcRecord smudge_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, smudge_inargs, @@ -1422,6 +1436,7 @@ static ProcRecord smudge_default_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, smudge_default_inargs, diff --git a/app/pdb/palette_cmds.c b/app/pdb/palette_cmds.c index 934dfed017..9c58c04f64 100644 --- a/app/pdb/palette_cmds.c +++ b/app/pdb/palette_cmds.c @@ -120,6 +120,7 @@ static ProcRecord palette_new_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, palette_new_inargs, @@ -195,6 +196,7 @@ static ProcRecord palette_duplicate_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, palette_duplicate_inargs, @@ -273,6 +275,7 @@ static ProcRecord palette_rename_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, palette_rename_inargs, @@ -338,6 +341,7 @@ static ProcRecord palette_delete_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, palette_delete_inargs, @@ -403,6 +407,7 @@ static ProcRecord palette_get_info_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, palette_get_info_inargs, @@ -490,6 +495,7 @@ static ProcRecord palette_add_entry_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 3, palette_add_entry_inargs, @@ -561,6 +567,7 @@ static ProcRecord palette_delete_entry_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, palette_delete_entry_inargs, @@ -648,6 +655,7 @@ static ProcRecord palette_entry_get_color_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, palette_entry_get_color_inargs, @@ -729,6 +737,7 @@ static ProcRecord palette_entry_set_color_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 3, palette_entry_set_color_inargs, @@ -811,6 +820,7 @@ static ProcRecord palette_entry_get_name_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 2, palette_entry_get_name_inargs, @@ -895,6 +905,7 @@ static ProcRecord palette_entry_set_name_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 3, palette_entry_set_name_inargs, diff --git a/app/pdb/palette_select_cmds.c b/app/pdb/palette_select_cmds.c index 7efa7efbc3..67cb847bc0 100644 --- a/app/pdb/palette_select_cmds.c +++ b/app/pdb/palette_select_cmds.c @@ -104,6 +104,7 @@ static ProcRecord palettes_popup_proc = "Michael Natterer ", "Michael Natterer", "2002", + FALSE, GIMP_INTERNAL, 3, palettes_popup_inargs, @@ -154,6 +155,7 @@ static ProcRecord palettes_close_popup_proc = "Michael Natterer ", "Michael Natterer", "2002", + FALSE, GIMP_INTERNAL, 1, palettes_close_popup_inargs, @@ -215,6 +217,7 @@ static ProcRecord palettes_set_popup_proc = "Michael Natterer ", "Michael Natterer", "2002", + FALSE, GIMP_INTERNAL, 2, palettes_set_popup_inargs, diff --git a/app/pdb/palettes_cmds.c b/app/pdb/palettes_cmds.c index 1e74b24d0e..d2938b9b1b 100644 --- a/app/pdb/palettes_cmds.c +++ b/app/pdb/palettes_cmds.c @@ -69,6 +69,7 @@ static ProcRecord palettes_refresh_proc = "Adrian Likins ", "Adrian Likins", "1998", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -138,6 +139,7 @@ static ProcRecord palettes_get_list_proc = "Nathan Summers ", "Nathan Summers", "2001", + FALSE, GIMP_INTERNAL, 1, palettes_get_list_inargs, @@ -191,6 +193,7 @@ static ProcRecord palettes_get_palette_proc = "", "", "", + TRUE, GIMP_INTERNAL, 0, NULL, @@ -304,6 +307,7 @@ static ProcRecord palettes_get_palette_entry_proc = "", "", "", + TRUE, GIMP_INTERNAL, 2, palettes_get_palette_entry_inargs, diff --git a/app/pdb/parasite_cmds.c b/app/pdb/parasite_cmds.c index 7c317a2d8a..71b7c387f1 100644 --- a/app/pdb/parasite_cmds.c +++ b/app/pdb/parasite_cmds.c @@ -117,6 +117,7 @@ static ProcRecord parasite_find_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 1, parasite_find_inargs, @@ -161,6 +162,7 @@ static ProcRecord parasite_attach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 1, parasite_attach_inargs, @@ -205,6 +207,7 @@ static ProcRecord parasite_detach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 1, parasite_detach_inargs, @@ -255,6 +258,7 @@ static ProcRecord parasite_list_proc = "Marc Lehmann", "Marc Lehmann", "1999", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -328,6 +332,7 @@ static ProcRecord drawable_parasite_find_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, drawable_parasite_find_inargs, @@ -382,6 +387,7 @@ static ProcRecord drawable_parasite_attach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, drawable_parasite_attach_inargs, @@ -436,6 +442,7 @@ static ProcRecord drawable_parasite_detach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, drawable_parasite_detach_inargs, @@ -505,6 +512,7 @@ static ProcRecord drawable_parasite_list_proc = "Marc Lehmann", "Marc Lehmann", "1999", + FALSE, GIMP_INTERNAL, 1, drawable_parasite_list_inargs, @@ -578,6 +586,7 @@ static ProcRecord image_parasite_find_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, image_parasite_find_inargs, @@ -632,6 +641,7 @@ static ProcRecord image_parasite_attach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, image_parasite_attach_inargs, @@ -686,6 +696,7 @@ static ProcRecord image_parasite_detach_proc = "Jay Cox", "Jay Cox", "1998", + FALSE, GIMP_INTERNAL, 2, image_parasite_detach_inargs, @@ -755,6 +766,7 @@ static ProcRecord image_parasite_list_proc = "Marc Lehmann", "Marc Lehmann", "1999", + FALSE, GIMP_INTERNAL, 1, image_parasite_list_inargs, diff --git a/app/pdb/paths_cmds.c b/app/pdb/paths_cmds.c index 2994769b2d..65a615651f 100644 --- a/app/pdb/paths_cmds.c +++ b/app/pdb/paths_cmds.c @@ -137,6 +137,7 @@ static ProcRecord path_list_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 1, path_list_inargs, @@ -205,6 +206,7 @@ static ProcRecord path_get_current_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 1, path_get_current_inargs, @@ -267,6 +269,7 @@ static ProcRecord path_set_current_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_set_current_inargs, @@ -329,6 +332,7 @@ static ProcRecord path_delete_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_delete_inargs, @@ -461,6 +465,7 @@ static ProcRecord path_get_points_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_get_points_inargs, @@ -579,6 +584,7 @@ static ProcRecord path_set_points_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 5, path_set_points_inargs, @@ -639,6 +645,7 @@ static ProcRecord path_stroke_current_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 1, path_stroke_current_inargs, @@ -772,6 +779,7 @@ static ProcRecord path_get_point_at_dist_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_get_point_at_dist_inargs, @@ -850,6 +858,7 @@ static ProcRecord path_get_tattoo_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_get_tattoo_inargs, @@ -920,6 +929,7 @@ static ProcRecord path_set_tattoo_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, path_set_tattoo_inargs, @@ -996,6 +1006,7 @@ static ProcRecord get_path_by_tattoo_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, get_path_by_tattoo_inargs, @@ -1074,6 +1085,7 @@ static ProcRecord path_get_locked_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 2, path_get_locked_inargs, @@ -1144,6 +1156,7 @@ static ProcRecord path_set_locked_proc = "Andy Thomas", "Andy Thomas", "1999", + FALSE, GIMP_INTERNAL, 3, path_set_locked_inargs, @@ -1255,6 +1268,7 @@ static ProcRecord path_to_selection_proc = "Joao S. O. Bueno", "Joao S. O. Bueno", "2003", + FALSE, GIMP_INTERNAL, 7, path_to_selection_inargs, @@ -1325,6 +1339,7 @@ static ProcRecord path_import_proc = "Sven Neumann", "Sven Neumann", "2003", + FALSE, GIMP_INTERNAL, 4, path_import_inargs, diff --git a/app/pdb/pattern_cmds.c b/app/pdb/pattern_cmds.c index 6fd0f6868a..71d790cf93 100644 --- a/app/pdb/pattern_cmds.c +++ b/app/pdb/pattern_cmds.c @@ -115,6 +115,7 @@ static ProcRecord pattern_get_info_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, pattern_get_info_inargs, @@ -132,8 +133,8 @@ pattern_get_pixels_invoker (Gimp *gimp, gboolean success = TRUE; Argument *return_args; gchar *name; - gint32 num_mask_bytes = 0; - guint8 *mask_bytes = NULL; + gint32 num_color_bytes = 0; + guint8 *color_bytes = NULL; GimpPattern *pattern = NULL; name = (gchar *) args[0].value.pdb_pointer; @@ -147,10 +148,10 @@ pattern_get_pixels_invoker (Gimp *gimp, if (pattern) { - num_mask_bytes = pattern->mask->height * pattern->mask->width * - pattern->mask->bytes; - mask_bytes = g_memdup (temp_buf_data (pattern->mask), - num_mask_bytes); + num_color_bytes = pattern->mask->height * pattern->mask->width * + pattern->mask->bytes; + color_bytes = g_memdup (temp_buf_data (pattern->mask), + num_color_bytes); } else success = FALSE; @@ -163,8 +164,8 @@ pattern_get_pixels_invoker (Gimp *gimp, return_args[1].value.pdb_int = pattern->mask->width; return_args[2].value.pdb_int = pattern->mask->height; return_args[3].value.pdb_int = pattern->mask->bytes; - return_args[4].value.pdb_int = num_mask_bytes; - return_args[5].value.pdb_pointer = mask_bytes; + return_args[4].value.pdb_int = num_color_bytes; + return_args[5].value.pdb_pointer = color_bytes; } return return_args; @@ -198,13 +199,13 @@ static ProcArg pattern_get_pixels_outargs[] = }, { GIMP_PDB_INT32, - "num_mask_bytes", - "Length of pattern mask data" + "num_color_bytes", + "Number of pattern bytes" }, { GIMP_PDB_INT8ARRAY, - "mask_bytes", - "The pattern mask data" + "color_bytes", + "The pattern data." } }; @@ -216,6 +217,7 @@ static ProcRecord pattern_get_pixels_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, pattern_get_pixels_inargs, diff --git a/app/pdb/pattern_select_cmds.c b/app/pdb/pattern_select_cmds.c index 0fa3a01bf0..182d6da559 100644 --- a/app/pdb/pattern_select_cmds.c +++ b/app/pdb/pattern_select_cmds.c @@ -104,6 +104,7 @@ static ProcRecord patterns_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 3, patterns_popup_inargs, @@ -154,6 +155,7 @@ static ProcRecord patterns_close_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 1, patterns_close_popup_inargs, @@ -215,6 +217,7 @@ static ProcRecord patterns_set_popup_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 2, patterns_set_popup_inargs, diff --git a/app/pdb/patterns_cmds.c b/app/pdb/patterns_cmds.c index aa5f9adb71..c4a7d67fe3 100644 --- a/app/pdb/patterns_cmds.c +++ b/app/pdb/patterns_cmds.c @@ -68,6 +68,7 @@ static ProcRecord patterns_refresh_proc = "Michael Natterer", "Michael Natterer", "2002", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -137,6 +138,7 @@ static ProcRecord patterns_get_list_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, patterns_get_list_inargs, @@ -196,6 +198,7 @@ static ProcRecord patterns_get_pattern_proc = "", "", "", + TRUE, GIMP_INTERNAL, 0, NULL, @@ -310,6 +313,7 @@ static ProcRecord patterns_get_pattern_data_proc = "", "", "", + TRUE, GIMP_INTERNAL, 1, patterns_get_pattern_data_inargs, diff --git a/app/pdb/plug_in_cmds.c b/app/pdb/plug_in_cmds.c index 4a46e4ffc7..57b5513e31 100644 --- a/app/pdb/plug_in_cmds.c +++ b/app/pdb/plug_in_cmds.c @@ -284,6 +284,7 @@ static ProcRecord plugins_query_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 1, plugins_query_inargs, @@ -346,6 +347,7 @@ static ProcRecord plugin_domain_register_proc = "Sven Neumann", "Sven Neumann", "2000", + FALSE, GIMP_INTERNAL, 2, plugin_domain_register_inargs, @@ -410,6 +412,7 @@ static ProcRecord plugin_help_register_proc = "Michael Natterer ", "Michael Natterer ", "2000", + FALSE, GIMP_INTERNAL, 2, plugin_help_register_inargs, @@ -527,6 +530,7 @@ static ProcRecord plugin_menu_register_proc = "Michael Natterer ", "Michael Natterer ", "2004", + FALSE, GIMP_INTERNAL, 2, plugin_menu_register_inargs, @@ -645,6 +649,7 @@ static ProcRecord plugin_icon_register_proc = "Michael Natterer ", "Michael Natterer ", "2004", + FALSE, GIMP_INTERNAL, 4, plugin_icon_register_inargs, diff --git a/app/pdb/procedural_db.h b/app/pdb/procedural_db.h index 7ef3f81c88..e0f8b2b68a 100644 --- a/app/pdb/procedural_db.h +++ b/app/pdb/procedural_db.h @@ -98,6 +98,8 @@ struct _ProcRecord gchar *copyright; /* Copyright field */ gchar *date; /* Date field */ + gboolean deprecated; /* Is the procedure deprecated? */ + /* Procedure type */ GimpPDBProcType proc_type; /* Type of procedure--Internal, Plug-In, Extension */ diff --git a/app/pdb/procedural_db_cmds.c b/app/pdb/procedural_db_cmds.c index 94a3815f9b..45d34acc56 100644 --- a/app/pdb/procedural_db_cmds.c +++ b/app/pdb/procedural_db_cmds.c @@ -367,6 +367,7 @@ static ProcRecord procedural_db_temp_name_proc = "Andy Thomas", "Andy Thomas", "1998", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -421,6 +422,7 @@ static ProcRecord procedural_db_dump_proc = "Spencer Kimball & Josh MacDonald", "Spencer Kimball & Josh MacDonald & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, procedural_db_dump_inargs, @@ -578,6 +580,7 @@ static ProcRecord procedural_db_query_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, procedural_db_query_inargs, @@ -706,6 +709,7 @@ static ProcRecord procedural_db_proc_info_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, procedural_db_proc_info_inargs, @@ -806,6 +810,7 @@ static ProcRecord procedural_db_proc_arg_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 2, procedural_db_proc_arg_inargs, @@ -906,6 +911,7 @@ static ProcRecord procedural_db_proc_val_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 2, procedural_db_proc_val_inargs, @@ -982,6 +988,7 @@ static ProcRecord procedural_db_get_data_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, procedural_db_get_data_inargs, @@ -1046,6 +1053,7 @@ static ProcRecord procedural_db_get_data_size_proc = "Nick Lamb", "Nick Lamb", "1998", + FALSE, GIMP_INTERNAL, 1, procedural_db_get_data_size_inargs, @@ -1108,6 +1116,7 @@ static ProcRecord procedural_db_set_data_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 3, procedural_db_set_data_inargs, diff --git a/app/pdb/progress_cmds.c b/app/pdb/progress_cmds.c index 96109e196f..48c935e65b 100644 --- a/app/pdb/progress_cmds.c +++ b/app/pdb/progress_cmds.c @@ -98,6 +98,7 @@ static ProcRecord progress_init_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, progress_init_inargs, @@ -145,6 +146,7 @@ static ProcRecord progress_update_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, progress_update_inargs, @@ -195,6 +197,7 @@ static ProcRecord progress_install_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, progress_install_inargs, @@ -245,6 +248,7 @@ static ProcRecord progress_uninstall_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, progress_uninstall_inargs, @@ -295,6 +299,7 @@ static ProcRecord progress_cancel_proc = "Michael Natterer ", "Michael Natterer", "2004", + FALSE, GIMP_INTERNAL, 1, progress_cancel_inargs, diff --git a/app/pdb/selection_cmds.c b/app/pdb/selection_cmds.c index 4712d2736a..1e343f654b 100644 --- a/app/pdb/selection_cmds.c +++ b/app/pdb/selection_cmds.c @@ -158,6 +158,7 @@ static ProcRecord selection_bounds_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_bounds_inargs, @@ -230,6 +231,7 @@ static ProcRecord selection_value_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, selection_value_inargs, @@ -286,6 +288,7 @@ static ProcRecord selection_is_empty_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_is_empty_inargs, @@ -346,6 +349,7 @@ static ProcRecord selection_translate_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, selection_translate_inargs, @@ -434,6 +438,7 @@ static ProcRecord selection_float_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, selection_float_inargs, @@ -478,6 +483,7 @@ static ProcRecord selection_clear_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_clear_inargs, @@ -522,6 +528,7 @@ static ProcRecord selection_invert_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_invert_inargs, @@ -566,6 +573,7 @@ static ProcRecord selection_sharpen_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_sharpen_inargs, @@ -610,6 +618,7 @@ static ProcRecord selection_all_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_all_inargs, @@ -654,6 +663,7 @@ static ProcRecord selection_none_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_none_inargs, @@ -708,6 +718,7 @@ static ProcRecord selection_feather_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, selection_feather_inargs, @@ -762,6 +773,7 @@ static ProcRecord selection_border_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, selection_border_inargs, @@ -816,6 +828,7 @@ static ProcRecord selection_grow_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, selection_grow_inargs, @@ -870,6 +883,7 @@ static ProcRecord selection_shrink_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, selection_shrink_inargs, @@ -920,6 +934,7 @@ static ProcRecord selection_layer_alpha_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_layer_alpha_inargs, @@ -977,6 +992,7 @@ static ProcRecord selection_load_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_load_inargs, @@ -1037,6 +1053,7 @@ static ProcRecord selection_save_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, selection_save_inargs, @@ -1104,6 +1121,7 @@ static ProcRecord selection_combine_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, selection_combine_inargs, diff --git a/app/pdb/selection_tools_cmds.c b/app/pdb/selection_tools_cmds.c index 10f8209f48..8c131216ba 100644 --- a/app/pdb/selection_tools_cmds.c +++ b/app/pdb/selection_tools_cmds.c @@ -159,6 +159,7 @@ static ProcRecord by_color_select_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 8, by_color_select_inargs, @@ -280,6 +281,7 @@ static ProcRecord ellipse_select_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 9, ellipse_select_inargs, @@ -386,6 +388,7 @@ static ProcRecord free_select_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 7, free_select_inargs, @@ -514,6 +517,7 @@ static ProcRecord fuzzy_select_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 9, fuzzy_select_inargs, @@ -626,6 +630,7 @@ static ProcRecord rect_select_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 8, rect_select_inargs, diff --git a/app/pdb/text_tool_cmds.c b/app/pdb/text_tool_cmds.c index 6a5d2804b5..de83b4c060 100644 --- a/app/pdb/text_tool_cmds.c +++ b/app/pdb/text_tool_cmds.c @@ -197,6 +197,7 @@ static ProcRecord text_fontname_proc = "Martin Edlman & Sven Neumann", "Spencer Kimball & Peter Mattis", "1998- 2001", + FALSE, GIMP_INTERNAL, 10, text_fontname_inargs, @@ -319,6 +320,7 @@ static ProcRecord text_get_extents_fontname_proc = "Martin Edlman & Sven Neumann", "Spencer Kimball & Peter Mattis", "1998- 2001", + FALSE, GIMP_INTERNAL, 4, text_get_extents_fontname_inargs, @@ -547,6 +549,7 @@ static ProcRecord text_proc = "Martin Edlman", "Spencer Kimball & Peter Mattis", "1998", + TRUE, GIMP_INTERNAL, 17, text_inargs, @@ -739,6 +742,7 @@ static ProcRecord text_get_extents_proc = "Martin Edlman", "Spencer Kimball & Peter Mattis", "1998", + TRUE, GIMP_INTERNAL, 11, text_get_extents_inargs, diff --git a/app/pdb/transform_tools_cmds.c b/app/pdb/transform_tools_cmds.c index eb8c5467ef..8df56e51ad 100644 --- a/app/pdb/transform_tools_cmds.c +++ b/app/pdb/transform_tools_cmds.c @@ -121,6 +121,7 @@ static ProcRecord flip_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 2, flip_inargs, @@ -282,6 +283,7 @@ static ProcRecord perspective_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 10, perspective_inargs, @@ -388,6 +390,7 @@ static ProcRecord rotate_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, rotate_inargs, @@ -520,6 +523,7 @@ static ProcRecord scale_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 6, scale_inargs, @@ -638,6 +642,7 @@ static ProcRecord shear_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 4, shear_inargs, @@ -793,6 +798,7 @@ static ProcRecord transform_2d_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 9, transform_2d_inargs, diff --git a/app/pdb/undo_cmds.c b/app/pdb/undo_cmds.c index 28fdaf74ad..c764e6d46d 100644 --- a/app/pdb/undo_cmds.c +++ b/app/pdb/undo_cmds.c @@ -96,6 +96,7 @@ static ProcRecord image_undo_group_start_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, image_undo_group_start_inargs, @@ -140,6 +141,7 @@ static ProcRecord image_undo_group_end_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1997", + FALSE, GIMP_INTERNAL, 1, image_undo_group_end_inargs, @@ -200,6 +202,7 @@ static ProcRecord image_undo_is_enabled_proc = "Raphael Quinet", "Raphael Quinet", "1999", + FALSE, GIMP_INTERNAL, 1, image_undo_is_enabled_inargs, @@ -259,6 +262,7 @@ static ProcRecord image_undo_disable_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_undo_disable_inargs, @@ -318,6 +322,7 @@ static ProcRecord image_undo_enable_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 1, image_undo_enable_inargs, @@ -377,6 +382,7 @@ static ProcRecord image_undo_freeze_proc = "Adam D. Moss", "Adam D. Moss", "1999", + FALSE, GIMP_INTERNAL, 1, image_undo_freeze_inargs, @@ -436,6 +442,7 @@ static ProcRecord image_undo_thaw_proc = "Adam D. Moss", "Adam D. Moss", "1999", + FALSE, GIMP_INTERNAL, 1, image_undo_thaw_inargs, diff --git a/app/pdb/unit_cmds.c b/app/pdb/unit_cmds.c index 61efad4947..6d752c769d 100644 --- a/app/pdb/unit_cmds.c +++ b/app/pdb/unit_cmds.c @@ -91,6 +91,7 @@ static ProcRecord unit_get_number_of_units_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -130,6 +131,7 @@ static ProcRecord unit_get_number_of_built_in_units_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 0, NULL, @@ -247,6 +249,7 @@ static ProcRecord unit_new_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 7, unit_new_inargs, @@ -303,6 +306,7 @@ static ProcRecord unit_get_deletion_flag_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_deletion_flag_inargs, @@ -355,6 +359,7 @@ static ProcRecord unit_set_deletion_flag_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 2, unit_set_deletion_flag_inargs, @@ -411,6 +416,7 @@ static ProcRecord unit_get_identifier_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_identifier_inargs, @@ -467,6 +473,7 @@ static ProcRecord unit_get_factor_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_factor_inargs, @@ -523,6 +530,7 @@ static ProcRecord unit_get_digits_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_digits_inargs, @@ -579,6 +587,7 @@ static ProcRecord unit_get_symbol_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_symbol_inargs, @@ -635,6 +644,7 @@ static ProcRecord unit_get_abbreviation_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_abbreviation_inargs, @@ -691,6 +701,7 @@ static ProcRecord unit_get_singular_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_singular_inargs, @@ -747,6 +758,7 @@ static ProcRecord unit_get_plural_proc = "Michael Natterer", "Michael Natterer", "1999", + FALSE, GIMP_INTERNAL, 1, unit_get_plural_inargs, diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 2defe2e230..a4fee2fed4 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -376,6 +376,25 @@ plug_in_handle_proc_run (PlugIn *plug_in, } } } + else if (proc_rec->deprecated) + { + if (plug_in->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_WARN) + { +#ifdef __GNUC__ +#warning FIXME: say which proc to use as replacement for deprecated one. +#endif + g_message ("WARNING: Plug-In \"%s\"\n(%s)\n" + "called deprecated procedure '%s'.\n" + "It should call '%s' instead!", + gimp_filename_to_utf8 (plug_in->name), + gimp_filename_to_utf8 (plug_in->prog), + proc_run->name, "FIXME"); + } + else if (plug_in->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_OFF) + { + proc_rec = NULL; + } + } if (! proc_name) proc_name = proc_run->name; diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 2defe2e230..a4fee2fed4 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -376,6 +376,25 @@ plug_in_handle_proc_run (PlugIn *plug_in, } } } + else if (proc_rec->deprecated) + { + if (plug_in->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_WARN) + { +#ifdef __GNUC__ +#warning FIXME: say which proc to use as replacement for deprecated one. +#endif + g_message ("WARNING: Plug-In \"%s\"\n(%s)\n" + "called deprecated procedure '%s'.\n" + "It should call '%s' instead!", + gimp_filename_to_utf8 (plug_in->name), + gimp_filename_to_utf8 (plug_in->prog), + proc_run->name, "FIXME"); + } + else if (plug_in->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_OFF) + { + proc_rec = NULL; + } + } if (! proc_name) proc_name = proc_run->name; diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index c34e3cd26a..a4725a8e96 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -101,6 +101,7 @@ static PlugInProcDef xcf_plug_in_load_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 3, xcf_load_args, @@ -157,6 +158,7 @@ static PlugInProcDef xcf_plug_in_save_proc = "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", + FALSE, GIMP_INTERNAL, 5, xcf_save_args, diff --git a/libgimp/gimpbrush_pdb.c b/libgimp/gimpbrush_pdb.c index 929e1fb8e5..c7c7ae6d04 100644 --- a/libgimp/gimpbrush_pdb.c +++ b/libgimp/gimpbrush_pdb.c @@ -162,6 +162,8 @@ gimp_brush_delete (const gchar *name) * @name: The brush name. * @width: The brush width. * @height: The brush height. + * @mask_bpp: The brush mask bpp. + * @color_bpp: The brush color bpp. * * Retrieve information about the specified brush. * @@ -175,7 +177,9 @@ gimp_brush_delete (const gchar *name) gboolean gimp_brush_get_info (const gchar *name, gint *width, - gint *height) + gint *height, + gint *mask_bpp, + gint *color_bpp) { GimpParam *return_vals; gint nreturn_vals; @@ -188,6 +192,8 @@ gimp_brush_get_info (const gchar *name, *width = 0; *height = 0; + *mask_bpp = 0; + *color_bpp = 0; success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; @@ -195,6 +201,8 @@ gimp_brush_get_info (const gchar *name, { *width = return_vals[1].data.d_int32; *height = return_vals[2].data.d_int32; + *mask_bpp = return_vals[3].data.d_int32; + *color_bpp = return_vals[4].data.d_int32; } gimp_destroy_params (return_vals, nreturn_vals); @@ -207,8 +215,12 @@ gimp_brush_get_info (const gchar *name, * @name: The brush name. * @width: The brush width. * @height: The brush height. + * @mask_bpp: The brush mask bpp. * @num_mask_bytes: Length of brush mask data. * @mask_bytes: The brush mask data. + * @color_bpp: The brush color bpp. + * @num_color_bytes: Length of brush color data. + * @color_bytes: The brush color data. * * Retrieve information about the specified brush. * @@ -223,8 +235,12 @@ gboolean gimp_brush_get_pixels (const gchar *name, gint *width, gint *height, + gint *mask_bpp, gint *num_mask_bytes, - guint8 **mask_bytes) + guint8 **mask_bytes, + gint *color_bpp, + gint *num_color_bytes, + guint8 **color_bytes) { GimpParam *return_vals; gint nreturn_vals; @@ -237,8 +253,12 @@ gimp_brush_get_pixels (const gchar *name, *width = 0; *height = 0; + *mask_bpp = 0; *num_mask_bytes = 0; *mask_bytes = NULL; + *color_bpp = 0; + *num_color_bytes = 0; + *color_bytes = NULL; success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; @@ -246,10 +266,16 @@ gimp_brush_get_pixels (const gchar *name, { *width = return_vals[1].data.d_int32; *height = return_vals[2].data.d_int32; - *num_mask_bytes = return_vals[3].data.d_int32; + *mask_bpp = return_vals[3].data.d_int32; + *num_mask_bytes = return_vals[4].data.d_int32; *mask_bytes = g_new (guint8, *num_mask_bytes); - memcpy (*mask_bytes, return_vals[4].data.d_int8array, + memcpy (*mask_bytes, return_vals[5].data.d_int8array, *num_mask_bytes * sizeof (guint8)); + *color_bpp = return_vals[6].data.d_int32; + *num_color_bytes = return_vals[7].data.d_int32; + *color_bytes = g_new (guint8, *num_color_bytes); + memcpy (*color_bytes, return_vals[8].data.d_int8array, + *num_color_bytes * sizeof (guint8)); } gimp_destroy_params (return_vals, nreturn_vals); diff --git a/libgimp/gimpbrush_pdb.h b/libgimp/gimpbrush_pdb.h index bb377682e8..46243bacf9 100644 --- a/libgimp/gimpbrush_pdb.h +++ b/libgimp/gimpbrush_pdb.h @@ -36,12 +36,18 @@ gchar* gimp_brush_rename (const gchar *name, gboolean gimp_brush_delete (const gchar *name); gboolean gimp_brush_get_info (const gchar *name, gint *width, - gint *height); + gint *height, + gint *mask_bpp, + gint *color_bpp); gboolean gimp_brush_get_pixels (const gchar *name, gint *width, gint *height, + gint *mask_bpp, gint *num_mask_bytes, - guint8 **mask_bytes); + guint8 **mask_bytes, + gint *color_bpp, + gint *num_color_bytes, + guint8 **color_bytes); gboolean gimp_brush_get_spacing (const gchar *name, gint *spacing); gboolean gimp_brush_set_spacing (const gchar *name, diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index e17cd6f01f..2ad7ebad91 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -114,10 +114,14 @@ gimp_brush_select_widget_new (const gchar *title, GimpRunBrushCallback callback, gpointer data) { - BrushSelect *brush_sel; - GtkWidget *frame; - GtkWidget *hbox; - gint mask_data_size; + BrushSelect *brush_sel; + GtkWidget *frame; + GtkWidget *hbox; + gint mask_bpp; + gint mask_data_size; + gint color_bpp; + gint color_data_size; + guint8 *color_data; g_return_val_if_fail (callback != NULL, NULL); @@ -171,9 +175,16 @@ gimp_brush_select_widget_new (const gchar *title, if (gimp_brush_get_pixels (brush_sel->brush_name, &brush_sel->width, &brush_sel->height, + &mask_bpp, &mask_data_size, - &brush_sel->mask_data)) + &brush_sel->mask_data, + &color_bpp, + &color_data_size, + &color_data)) { + if (color_data) + g_free (color_data); + if (opacity == -1) brush_sel->opacity = gimp_context_get_opacity (); else @@ -249,11 +260,15 @@ gimp_brush_select_widget_set (GtkWidget *widget, } else { + gchar *name; gint width; gint height; + gint mask_bpp; gint mask_data_size; guint8 *mask_data; - gchar *name; + gint color_bpp; + gint color_data_size; + guint8 *color_data; if (! brush_name || ! strlen (brush_name)) name = gimp_context_get_brush (); @@ -263,9 +278,16 @@ gimp_brush_select_widget_set (GtkWidget *widget, if (gimp_brush_get_pixels (name, &width, &height, + &mask_bpp, &mask_data_size, - &mask_data)) + &mask_data, + &color_bpp, + &color_data_size, + &color_data)) { + if (color_data) + g_free (color_data); + if (opacity == -1.0) opacity = gimp_context_get_opacity (); diff --git a/libgimp/gimppattern_pdb.c b/libgimp/gimppattern_pdb.c index c945059218..c68052b1ee 100644 --- a/libgimp/gimppattern_pdb.c +++ b/libgimp/gimppattern_pdb.c @@ -82,8 +82,8 @@ gimp_pattern_get_info (const gchar *name, * @width: The pattern width. * @height: The pattern height. * @bpp: The pattern bpp. - * @num_mask_bytes: Length of pattern mask data. - * @mask_bytes: The pattern mask data. + * @num_color_bytes: Number of pattern bytes. + * @color_bytes: The pattern data. * * Retrieve information about the specified pattern (including pixels). * @@ -100,8 +100,8 @@ gimp_pattern_get_pixels (const gchar *name, gint *width, gint *height, gint *bpp, - gint *num_mask_bytes, - guint8 **mask_bytes) + gint *num_color_bytes, + guint8 **color_bytes) { GimpParam *return_vals; gint nreturn_vals; @@ -115,8 +115,8 @@ gimp_pattern_get_pixels (const gchar *name, *width = 0; *height = 0; *bpp = 0; - *num_mask_bytes = 0; - *mask_bytes = NULL; + *num_color_bytes = 0; + *color_bytes = NULL; success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS; @@ -125,10 +125,10 @@ gimp_pattern_get_pixels (const gchar *name, *width = return_vals[1].data.d_int32; *height = return_vals[2].data.d_int32; *bpp = return_vals[3].data.d_int32; - *num_mask_bytes = return_vals[4].data.d_int32; - *mask_bytes = g_new (guint8, *num_mask_bytes); - memcpy (*mask_bytes, return_vals[5].data.d_int8array, - *num_mask_bytes * sizeof (guint8)); + *num_color_bytes = return_vals[4].data.d_int32; + *color_bytes = g_new (guint8, *num_color_bytes); + memcpy (*color_bytes, return_vals[5].data.d_int8array, + *num_color_bytes * sizeof (guint8)); } gimp_destroy_params (return_vals, nreturn_vals); diff --git a/libgimp/gimppattern_pdb.h b/libgimp/gimppattern_pdb.h index 72d7d37749..d53e24f781 100644 --- a/libgimp/gimppattern_pdb.h +++ b/libgimp/gimppattern_pdb.h @@ -37,8 +37,8 @@ gboolean gimp_pattern_get_pixels (const gchar *name, gint *width, gint *height, gint *bpp, - gint *num_mask_bytes, - guint8 **mask_bytes); + gint *num_color_bytes, + guint8 **color_bytes); G_END_DECLS diff --git a/plug-ins/gfig/gfig-style.c b/plug-ins/gfig/gfig-style.c index 1c43131460..b2d8061927 100644 --- a/plug-ins/gfig/gfig-style.c +++ b/plug-ins/gfig/gfig-style.c @@ -575,6 +575,8 @@ void gfig_read_gimp_style (Style *style, const gchar *name) { + gint dummy; + if (!name) g_message ("Error: name is NULL in gfig_read_gimp_style."); @@ -587,7 +589,8 @@ gfig_read_gimp_style (Style *style, style->brush_name = gimp_context_get_brush (); gimp_brush_get_info (style->brush_name, - &style->brush_width, &style->brush_height); + &style->brush_width, &style->brush_height, + &dummy, &dummy); gimp_brush_get_spacing (style->brush_name, &style->brush_spacing); style->gradient = gimp_context_get_gradient (); @@ -690,8 +693,9 @@ mygimp_brush_info (gint *width, gint *height) { gchar *name = gimp_context_get_brush (); + gint dummy; - if (name && gimp_brush_get_info (name, width, height)) + if (name && gimp_brush_get_info (name, width, height, &dummy, &dummy)) { *width = MAX (*width, 32); *height = MAX (*height, 32); diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl index e41e104923..8e9db6259c 100644 --- a/tools/pdbgen/app.pl +++ b/tools/pdbgen/app.pl @@ -664,6 +664,7 @@ static ProcRecord ${name}_proc = "$proc->{author}", "$proc->{copyright}", "$proc->{date}", + @{[$proc->{deprecated} ? 'TRUE' : 'FALSE']}, GIMP_INTERNAL, @{[scalar @inargs]}, @{[scalar @inargs ? "${name}_inargs" : 'NULL']}, diff --git a/tools/pdbgen/pdb/brush.pdb b/tools/pdbgen/pdb/brush.pdb index 395b95320a..1c2f6ac047 100644 --- a/tools/pdbgen/pdb/brush.pdb +++ b/tools/pdbgen/pdb/brush.pdb @@ -200,7 +200,13 @@ HELP desc => "The brush width" }, { name => 'height', type => 'int32', no_declare => '1', alias => 'brush->mask->height', - desc => "The brush height" } + desc => "The brush height" }, + { name => 'mask_bpp', type => 'int32', no_declare => '1', + alias => 'brush->mask->bytes', + desc => "The brush mask bpp" }, + { name => 'color_bpp', type => 'int32', no_declare => '1', + alias => 'brush->pixmap ? brush->pixmap->bytes : 0', + desc => "The brush color bpp" } ); %invoke = ( @@ -216,6 +222,71 @@ CODE ); } +sub brush_get_pixels { + $blurb = <<'BLURB'; +Retrieve information about the specified brush. +BLURB + + $help = <<'HELP'; +This procedure retrieves information about the specified brush. This +includes the brush extents (width and height) and its pixels data. +HELP + + &mitch_misc; + + @inargs = ( + &brush_arg + ); + + @outargs = ( + { name => 'width', type => 'int32', no_declare => '1', + alias => 'brush->mask->width', void_ret => '1', + desc => "The brush width" }, + { name => 'height', type => 'int32', no_declare => '1', + alias => 'brush->mask->height', + desc => "The brush height" }, + { name => 'mask_bpp', type => 'int32', init => '1', + desc => "The brush mask bpp" }, + { name => 'mask_bytes', type => 'int8array', init => '1', + desc => 'The brush mask data', + array => { init => '1', + desc => 'Length of brush mask data' } }, + { name => 'color_bpp', type => 'int32', init => '1', + desc => "The brush color bpp" }, + { name => 'color_bytes', type => 'int8array', init => '1', + desc => 'The brush color data', + array => { init => '1', + desc => 'Length of brush color data' } } + ); + + %invoke = ( + vars => [ 'GimpBrush *brush = NULL' ], + code => <<'CODE' +{ + brush = (GimpBrush *) + gimp_container_get_child_by_name (gimp->brush_factory->container, name); + + if (brush) + { + mask_bpp = brush->mask->bytes; + num_mask_bytes = brush->mask->height * brush->mask->width; + mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes); + + if (brush->pixmap) + { + color_bpp = brush->pixmap->bytes; + num_color_bytes = brush->pixmap->height * brush->pixmap->width; + color_bytes = g_memdup (temp_buf_data (brush->pixmap), + num_color_bytes); + } + } + else + success = FALSE; +} +CODE + ); +} + sub brush_get_spacing { $blurb = 'Get the brush spacing.'; @@ -282,54 +353,6 @@ CODE ); } -sub brush_get_pixels { - $blurb = <<'BLURB'; -Retrieve information about the specified brush. -BLURB - - $help = <<'HELP'; -This procedure retrieves information about the specified brush. This -includes the brush extents (width and height) and its pixels data. -HELP - - &mitch_misc; - - @inargs = ( - &brush_arg - ); - - @outargs = ( - { name => 'width', type => 'int32', no_declare => '1', - alias => 'brush->mask->width', void_ret => '1', - desc => "The brush width" }, - { name => 'height', type => 'int32', no_declare => '1', - alias => 'brush->mask->height', - desc => "The brush height" }, - { name => 'mask_bytes', type => 'int8array', init => 1, - desc => 'The brush mask data', - array => { init => 1, - desc => 'Length of brush mask data' } } - ); - - %invoke = ( - vars => [ 'GimpBrush *brush = NULL' ], - code => <<'CODE' -{ - brush = (GimpBrush *) - gimp_container_get_child_by_name (gimp->brush_factory->container, name); - - if (brush) - { - num_mask_bytes = brush->mask->height * brush->mask->width; - mask_bytes = g_memdup (temp_buf_data (brush->mask), num_mask_bytes); - } - else - success = FALSE; -} -CODE - ); -} - @headers = qw( "base/temp-buf.h" "core/gimp.h" "core/gimplist.h" "core/gimpbrush.h" diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index fb2bbede1e..d57238599b 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -812,6 +812,8 @@ sub image_add_layer_mask { $blurb = $help = "This procedure is deprecated! Use 'gimp_layer_add_mask' instead."; $author = $copyright = $date = ''; + $deprecated = 1; + @inargs = ( &std_image_arg, &layer_arg, @@ -833,6 +835,8 @@ sub image_remove_layer_mask { $blurb = $help = "This procedure is deprecated! Use 'gimp_layer_remove_mask' instead."; $author = $copyright = $date = ''; + $deprecated = 1; + @inargs = ( &std_image_arg, &layer_arg, diff --git a/tools/pdbgen/pdb/pattern.pdb b/tools/pdbgen/pdb/pattern.pdb index fcf4bf2e4c..ce4c4eb6e2 100644 --- a/tools/pdbgen/pdb/pattern.pdb +++ b/tools/pdbgen/pdb/pattern.pdb @@ -98,10 +98,10 @@ HELP { name => 'bpp', type => 'int32', no_declare => '1', alias => 'pattern->mask->bytes', desc => "The pattern bpp" }, - { name => 'mask_bytes', type => 'int8array', init => 1, - desc => 'The pattern mask data', + { name => 'color_bytes', type => 'int8array', init => 1, + desc => 'The pattern data.', array => { init => 1, - desc => 'Length of pattern mask data' } } + desc => 'Number of pattern bytes' } } ); %invoke = ( @@ -113,10 +113,10 @@ HELP if (pattern) { - num_mask_bytes = pattern->mask->height * pattern->mask->width * - pattern->mask->bytes; - mask_bytes = g_memdup (temp_buf_data (pattern->mask), - num_mask_bytes); + num_color_bytes = pattern->mask->height * pattern->mask->width * + pattern->mask->bytes; + color_bytes = g_memdup (temp_buf_data (pattern->mask), + num_color_bytes); } else success = FALSE;