Commit bc36159a authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

store canonical names of proc names and args in the proc structure.

2005-08-05  Manish Singh  <yosh@gimp.org>

        * tools/pdbgen/pdbgen.pl: store canonical names of proc names and
        args in the proc structure.

        * tools/pdbgen/app.pl
        * tools/pdbgen/lib.pl: use the above.

        * app/pdb/*_cmds.c: regenerated.
parent 1755b50b
2005-08-05 Manish Singh <yosh@gimp.org>
* tools/pdbgen/pdbgen.pl: store canonical names of proc names and
args in the proc structure.
* tools/pdbgen/app.pl
* tools/pdbgen/lib.pl: use the above.
* app/pdb/*_cmds.c: regenerated.
2005-08-05 Michael Natterer <mitch@gimp.org>
* app/core/gimpitem.c (gimp_item_parasite_attach): revert previous
......
......@@ -347,7 +347,7 @@ static ProcArg brush_rename_inargs[] =
},
{
GIMP_PDB_STRING,
"new_name",
"new-name",
"The new name of the brush"
}
};
......@@ -575,12 +575,12 @@ static ProcArg brush_get_info_outargs[] =
},
{
GIMP_PDB_INT32,
"mask_bpp",
"mask-bpp",
"The brush mask bpp"
},
{
GIMP_PDB_INT32,
"color_bpp",
"color-bpp",
"The brush color bpp"
}
};
......@@ -687,32 +687,32 @@ static ProcArg brush_get_pixels_outargs[] =
},
{
GIMP_PDB_INT32,
"mask_bpp",
"mask-bpp",
"The brush mask bpp"
},
{
GIMP_PDB_INT32,
"num_mask_bytes",
"num-mask-bytes",
"Length of brush mask data"
},
{
GIMP_PDB_INT8ARRAY,
"mask_bytes",
"mask-bytes",
"The brush mask data"
},
{
GIMP_PDB_INT32,
"color_bpp",
"color-bpp",
"The brush color bpp"
},
{
GIMP_PDB_INT32,
"num_color_bytes",
"num-color-bytes",
"Length of brush color data"
},
{
GIMP_PDB_INT8ARRAY,
"color_bytes",
"color-bytes",
"The brush color data"
}
};
......@@ -1179,7 +1179,7 @@ static ProcArg brush_get_aspect_ratio_outargs[] =
{
{
GIMP_PDB_FLOAT,
"aspect_ratio",
"aspect-ratio",
"The aspect ratio of the brush."
}
};
......@@ -1315,7 +1315,7 @@ static ProcArg brush_set_shape_inargs[] =
},
{
GIMP_PDB_INT32,
"shape_in",
"shape-in",
"An enumerated value representing the desired brush shape"
}
};
......@@ -1324,7 +1324,7 @@ static ProcArg brush_set_shape_outargs[] =
{
{
GIMP_PDB_INT32,
"shape_out",
"shape-out",
"The brush shape actually assigned"
}
};
......@@ -1393,7 +1393,7 @@ static ProcArg brush_set_radius_inargs[] =
},
{
GIMP_PDB_FLOAT,
"radius_in",
"radius-in",
"The desired brush radius"
}
};
......@@ -1402,7 +1402,7 @@ static ProcArg brush_set_radius_outargs[] =
{
{
GIMP_PDB_FLOAT,
"radius_out",
"radius-out",
"The brush radius actually assigned"
}
};
......@@ -1471,7 +1471,7 @@ static ProcArg brush_set_spikes_inargs[] =
},
{
GIMP_PDB_INT32,
"spikes_in",
"spikes-in",
"The desired number of spikes"
}
};
......@@ -1480,7 +1480,7 @@ static ProcArg brush_set_spikes_outargs[] =
{
{
GIMP_PDB_INT32,
"spikes_out",
"spikes-out",
"The number of spikes actually assigned"
}
};
......@@ -1549,7 +1549,7 @@ static ProcArg brush_set_hardness_inargs[] =
},
{
GIMP_PDB_FLOAT,
"hardness_in",
"hardness-in",
"The desired brush hardness"
}
};
......@@ -1558,7 +1558,7 @@ static ProcArg brush_set_hardness_outargs[] =
{
{
GIMP_PDB_FLOAT,
"hardness_out",
"hardness-out",
"The brush hardness actually assigned"
}
};
......@@ -1627,7 +1627,7 @@ static ProcArg brush_set_aspect_ratio_inargs[] =
},
{
GIMP_PDB_FLOAT,
"aspect_ratio_in",
"aspect-ratio-in",
"The desired brush aspect ratio"
}
};
......@@ -1636,7 +1636,7 @@ static ProcArg brush_set_aspect_ratio_outargs[] =
{
{
GIMP_PDB_FLOAT,
"aspect_ratio_out",
"aspect-ratio-out",
"The brush aspect ratio actually assigned"
}
};
......@@ -1705,7 +1705,7 @@ static ProcArg brush_set_angle_inargs[] =
},
{
GIMP_PDB_FLOAT,
"angle_in",
"angle-in",
"The desired brush rotation angle"
}
};
......@@ -1714,7 +1714,7 @@ static ProcArg brush_set_angle_outargs[] =
{
{
GIMP_PDB_FLOAT,
"angle_out",
"angle-out",
"The brush rotation angle actually assigned"
}
};
......
......@@ -99,17 +99,17 @@ static ProcArg brushes_popup_inargs[] =
{
{
GIMP_PDB_STRING,
"brush_callback",
"brush-callback",
"The callback PDB proc to call when brush selection is made"
},
{
GIMP_PDB_STRING,
"popup_title",
"popup-title",
"Title to give the brush popup window"
},
{
GIMP_PDB_STRING,
"initial_brush",
"initial-brush",
"The name of the brush to set as the first selected"
},
{
......@@ -124,7 +124,7 @@ static ProcArg brushes_popup_inargs[] =
},
{
GIMP_PDB_INT32,
"paint_mode",
"paint-mode",
"The initial paint mode: { GIMP_NORMAL_MODE (0), GIMP_DISSOLVE_MODE (1), GIMP_BEHIND_MODE (2), GIMP_MULTIPLY_MODE (3), GIMP_SCREEN_MODE (4), GIMP_OVERLAY_MODE (5), GIMP_DIFFERENCE_MODE (6), GIMP_ADDITION_MODE (7), GIMP_SUBTRACT_MODE (8), GIMP_DARKEN_ONLY_MODE (9), GIMP_LIGHTEN_ONLY_MODE (10), GIMP_HUE_MODE (11), GIMP_SATURATION_MODE (12), GIMP_COLOR_MODE (13), GIMP_VALUE_MODE (14), GIMP_DIVIDE_MODE (15), GIMP_DODGE_MODE (16), GIMP_BURN_MODE (17), GIMP_HARDLIGHT_MODE (18), GIMP_SOFTLIGHT_MODE (19), GIMP_GRAIN_EXTRACT_MODE (20), GIMP_GRAIN_MERGE_MODE (21), GIMP_COLOR_ERASE_MODE (22) }"
}
};
......@@ -176,7 +176,7 @@ static ProcArg brushes_close_popup_inargs[] =
{
{
GIMP_PDB_STRING,
"brush_callback",
"brush-callback",
"The name of the callback registered for this popup"
}
};
......@@ -252,12 +252,12 @@ static ProcArg brushes_set_popup_inargs[] =
{
{
GIMP_PDB_STRING,
"brush_callback",
"brush-callback",
"The name of the callback registered for this popup"
},
{
GIMP_PDB_STRING,
"brush_name",
"brush-name",
"The name of the brush to set as selected"
},
{
......@@ -272,7 +272,7 @@ static ProcArg brushes_set_popup_inargs[] =
},
{
GIMP_PDB_INT32,
"paint_mode",
"paint-mode",
"The initial paint mode: { GIMP_NORMAL_MODE (0), GIMP_DISSOLVE_MODE (1), GIMP_BEHIND_MODE (2), GIMP_MULTIPLY_MODE (3), GIMP_SCREEN_MODE (4), GIMP_OVERLAY_MODE (5), GIMP_DIFFERENCE_MODE (6), GIMP_ADDITION_MODE (7), GIMP_SUBTRACT_MODE (8), GIMP_DARKEN_ONLY_MODE (9), GIMP_LIGHTEN_ONLY_MODE (10), GIMP_HUE_MODE (11), GIMP_SATURATION_MODE (12), GIMP_COLOR_MODE (13), GIMP_VALUE_MODE (14), GIMP_DIVIDE_MODE (15), GIMP_DODGE_MODE (16), GIMP_BURN_MODE (17), GIMP_HARDLIGHT_MODE (18), GIMP_SOFTLIGHT_MODE (19), GIMP_GRAIN_EXTRACT_MODE (20), GIMP_GRAIN_MERGE_MODE (21), GIMP_COLOR_ERASE_MODE (22) }"
}
};
......
......@@ -124,12 +124,12 @@ static ProcArg brushes_get_list_outargs[] =
{
{
GIMP_PDB_INT32,
"num_brushes",
"num-brushes",
"The number of brushes in the brush list"
},
{
GIMP_PDB_STRINGARRAY,
"brush_list",
"brush-list",
"The list of brush names"
}
};
......@@ -389,7 +389,7 @@ static ProcArg brushes_get_brush_data_outargs[] =
},
{
GIMP_PDB_INT32,
"paint_mode",
"paint-mode",
"The paint mode: { GIMP_NORMAL_MODE (0), GIMP_DISSOLVE_MODE (1), GIMP_BEHIND_MODE (2), GIMP_MULTIPLY_MODE (3), GIMP_SCREEN_MODE (4), GIMP_OVERLAY_MODE (5), GIMP_DIFFERENCE_MODE (6), GIMP_ADDITION_MODE (7), GIMP_SUBTRACT_MODE (8), GIMP_DARKEN_ONLY_MODE (9), GIMP_LIGHTEN_ONLY_MODE (10), GIMP_HUE_MODE (11), GIMP_SATURATION_MODE (12), GIMP_COLOR_MODE (13), GIMP_VALUE_MODE (14), GIMP_DIVIDE_MODE (15), GIMP_DODGE_MODE (16), GIMP_BURN_MODE (17), GIMP_HARDLIGHT_MODE (18), GIMP_SOFTLIGHT_MODE (19), GIMP_GRAIN_EXTRACT_MODE (20), GIMP_GRAIN_MERGE_MODE (21), GIMP_COLOR_ERASE_MODE (22) }"
},
{
......@@ -409,7 +409,7 @@ static ProcArg brushes_get_brush_data_outargs[] =
},
{
GIMP_PDB_INT8ARRAY,
"mask_data",
"mask-data",
"The brush mask data"
}
};
......
......@@ -308,7 +308,7 @@ static ProcArg channel_copy_outargs[] =
{
{
GIMP_PDB_CHANNEL,
"channel_copy",
"channel-copy",
"The newly copied channel"
}
};
......@@ -450,7 +450,7 @@ static ProcArg channel_get_show_masked_outargs[] =
{
{
GIMP_PDB_INT32,
"show_masked",
"show-masked",
"The channel composite method"
}
};
......@@ -504,7 +504,7 @@ static ProcArg channel_set_show_masked_inargs[] =
},
{
GIMP_PDB_INT32,
"show_masked",
"show-masked",
"The new channel composite method"
}
};
......
......@@ -265,12 +265,12 @@ static ProcArg levels_inargs[] =
},
{
GIMP_PDB_INT32,
"low_input",
"low-input",
"Intensity of lowest input: (0 <= low_input <= 255)"
},
{
GIMP_PDB_INT32,
"high_input",
"high-input",
"Intensity of highest input: (0 <= high_input <= 255)"
},
{
......@@ -280,12 +280,12 @@ static ProcArg levels_inargs[] =
},
{
GIMP_PDB_INT32,
"low_output",
"low-output",
"Intensity of lowest output: (0 <= low_output <= 255)"
},
{
GIMP_PDB_INT32,
"high_output",
"high-output",
"Intensity of highest output: (0 <= high_output <= 255)"
}
};
......@@ -595,7 +595,7 @@ static ProcArg desaturate_full_inargs[] =
},
{
GIMP_PDB_INT32,
"desaturate_mode",
"desaturate-mode",
"The formula to use to desaturate"
}
};
......@@ -656,7 +656,7 @@ static ProcArg equalize_inargs[] =
},
{
GIMP_PDB_INT32,
"mask_only",
"mask-only",
"Equalization option"
}
};
......@@ -840,12 +840,12 @@ static ProcArg curves_spline_inargs[] =
},
{
GIMP_PDB_INT32,
"num_points",
"num-points",
"The number of values in the control point array (3 < num_points <= 34)"
},
{
GIMP_PDB_INT8ARRAY,
"control_pts",
"control-pts",
"The spline control points: { cp1.x, cp1.y, cp2.x, cp2.y, ... }"
}
};
......@@ -967,7 +967,7 @@ static ProcArg curves_explicit_inargs[] =
},
{
GIMP_PDB_INT32,
"num_bytes",
"num-bytes",
"The number of bytes in the new curve (always 256)"
},
{
......@@ -1083,27 +1083,27 @@ static ProcArg color_balance_inargs[] =
},
{
GIMP_PDB_INT32,
"transfer_mode",
"transfer-mode",
"Transfer mode: { GIMP_SHADOWS (0), GIMP_MIDTONES (1), GIMP_HIGHLIGHTS (2) }"
},
{
GIMP_PDB_INT32,
"preserve_lum",
"preserve-lum",
"Preserve luminosity values at each pixel"
},
{
GIMP_PDB_FLOAT,
"cyan_red",
"cyan-red",
"Cyan-Red color balance: (-100 <= cyan_red <= 100)"
},
{
GIMP_PDB_FLOAT,
"magenta_green",
"magenta-green",
"Magenta-Green color balance: (-100 <= magenta_green <= 100)"
},
{
GIMP_PDB_FLOAT,
"yellow_blue",
"yellow-blue",
"Yellow-Blue color balance: (-100 <= yellow_blue <= 100)"
}
};
......@@ -1332,12 +1332,12 @@ static ProcArg histogram_inargs[] =
},
{
GIMP_PDB_INT32,
"start_range",
"start-range",
"Start of the intensity measurement range"
},
{
GIMP_PDB_INT32,
"end_range",
"end-range",
"End of the intensity measurement range"
}
};
......@@ -1351,7 +1351,7 @@ static ProcArg histogram_outargs[] =
},
{
GIMP_PDB_FLOAT,
"std_dev",
"std-dev",
"Standard deviation of intensity values"
},
{
......@@ -1478,12 +1478,12 @@ static ProcArg hue_saturation_inargs[] =
},
{
GIMP_PDB_INT32,
"hue_range",
"hue-range",
"Range of affected hues: { GIMP_ALL_HUES (0), GIMP_RED_HUES (1), GIMP_YELLOW_HUES (2), GIMP_GREEN_HUES (3), GIMP_CYAN_HUES (4), GIMP_BLUE_HUES (5), GIMP_MAGENTA_HUES (6) }"
},
{
GIMP_PDB_FLOAT,
"hue_offset",
"hue-offset",
"Hue offset in degrees: (-180 <= hue_offset <= 180)"
},
{
......@@ -1586,12 +1586,12 @@ static ProcArg threshold_inargs[] =
},
{
GIMP_PDB_INT32,
"low_threshold",
"low-threshold",
"The low threshold value: 0 <= low_threshold <= 255"
},
{
GIMP_PDB_INT32,
"high_threshold",
"high-threshold",
"The high threshold value: 0 <= high_threshold <= 255"
}
};
......
......@@ -492,7 +492,7 @@ static ProcArg context_get_paint_mode_outargs[] =
{
{
GIMP_PDB_INT32,
"paint_mode",
"paint-mode",
"The paint mode: { GIMP_NORMAL_MODE (0), GIMP_DISSOLVE_MODE (1), GIMP_BEHIND_MODE (2), GIMP_MULTIPLY_MODE (3), GIMP_SCREEN_MODE (4), GIMP_OVERLAY_MODE (5), GIMP_DIFFERENCE_MODE (6), GIMP_ADDITION_MODE (7), GIMP_SUBTRACT_MODE (8), GIMP_DARKEN_ONLY_MODE (9), GIMP_LIGHTEN_ONLY_MODE (10), GIMP_HUE_MODE (11), GIMP_SATURATION_MODE (12), GIMP_COLOR_MODE (13), GIMP_VALUE_MODE (14), GIMP_DIVIDE_MODE (15), GIMP_DODGE_MODE (16), GIMP_BURN_MODE (17), GIMP_HARDLIGHT_MODE (18), GIMP_SOFTLIGHT_MODE (19), GIMP_GRAIN_EXTRACT_MODE (20), GIMP_GRAIN_MERGE_MODE (21), GIMP_COLOR_ERASE_MODE (22) }"
}
};
......@@ -538,7 +538,7 @@ static ProcArg context_set_paint_mode_inargs[] =
{
{
GIMP_PDB_INT32,
"paint_mode",
"paint-mode",
"The paint mode: { GIMP_NORMAL_MODE (0), GIMP_DISSOLVE_MODE (1), GIMP_BEHIND_MODE (2), GIMP_MULTIPLY_MODE (3), GIMP_SCREEN_MODE (4), GIMP_OVERLAY_MODE (5), GIMP_DIFFERENCE_MODE (6), GIMP_ADDITION_MODE (7), GIMP_SUBTRACT_MODE (8), GIMP_DARKEN_ONLY_MODE (9), GIMP_LIGHTEN_ONLY_MODE (10), GIMP_HUE_MODE (11), GIMP_SATURATION_MODE (12), GIMP_COLOR_MODE (13), GIMP_VALUE_MODE (14), GIMP_DIVIDE_MODE (15), GIMP_DODGE_MODE (16), GIMP_BURN_MODE (17), GIMP_HARDLIGHT_MODE (18), GIMP_SOFTLIGHT_MODE (19), GIMP_GRAIN_EXTRACT_MODE (20), GIMP_GRAIN_MERGE_MODE (21), GIMP_COLOR_ERASE_MODE (22) }"
}
};
......
......@@ -232,27 +232,27 @@ static ProcArg image_convert_indexed_inargs[] =
},
{
GIMP_PDB_INT32,
"dither_type",
"dither-type",
"The dither type to use: { GIMP_NO_DITHER (0), GIMP_FS_DITHER (1), GIMP_FSLOWBLEED_DITHER (2), GIMP_FIXED_DITHER (3) }"
},
{
GIMP_PDB_INT32,
"palette_type",
"palette-type",
"The type of palette to use: { GIMP_MAKE_PALETTE (0), GIMP_REUSE_PALETTE (1), GIMP_WEB_PALETTE (2), GIMP_MONO_PALETTE (3), GIMP_CUSTOM_PALETTE (4) }"
},
{
GIMP_PDB_INT32,
"num_cols",
"num-cols",
"The number of colors to quantize to, ignored unless (palette_type == GIMP_MAKE_PALETTE)"
},
{
GIMP_PDB_INT32,
"alpha_dither",
"alpha-dither",
"Dither transparency to fake partial opacity"
},
{
GIMP_PDB_INT32,
"remove_unused",
"remove-unused",
"Remove unused or duplicate colour entries from final palette, ignored if (palette_type == GIMP_MAKE_PALETTE)"
},
{
......
......@@ -229,12 +229,12 @@ static ProcArg displays_reconnect_inargs[] =
{
{
GIMP_PDB_IMAGE,
"old_image",
"old-image",
"The old image (must have at least one display)"
},
{
GIMP_PDB_IMAGE,
"new_image",
"new-image",
"The new image (must not have a display)"
}
};
......
......@@ -261,7 +261,7 @@ static ProcArg drawable_is_layer_mask_outargs[] =
{
{
GIMP_PDB_INT32,
"layer_mask",
"layer-mask",
"Non-zero if the drawable is a layer mask"
}
};
......@@ -435,7 +435,7 @@ static ProcArg drawable_type_with_alpha_outargs[] =
{
{
GIMP_PDB_INT32,
"type_with_alpha",
"type-with-alpha",
"The drawable's type with alpha: { GIMP_RGB_IMAGE (0), GIMP_RGBA_IMAGE (1), GIMP_GRAY_IMAGE (2), GIMP_GRAYA_IMAGE (3), GIMP_INDEXED_IMAGE (4), GIMP_INDEXEDA_IMAGE (5) }"
}
};
......@@ -493,7 +493,7 @@ static ProcArg drawable_has_alpha_outargs[] =
{
{
GIMP_PDB_INT32,
"has_alpha",
"has-alpha",
"Does the drawable have an alpha channel?"
}
};
......@@ -551,7 +551,7 @@ static ProcArg drawable_is_rgb_outargs[] =
{
{
GIMP_PDB_INT32,
"is_rgb",
"is-rgb",
"non-zero if the drawable is an RGB type"
}
};
......@@ -609,7 +609,7 @@ static ProcArg drawable_is_gray_outargs[] =
{
{
GIMP_PDB_INT32,
"is_gray",
"is-gray",
"non-zero if the drawable is a grayscale type"
}
};
......@@ -667,7 +667,7 @@ static ProcArg drawable_is_indexed_outargs[] =
{
{
GIMP_PDB_INT32,
"is_indexed",
"is-indexed",
"non-zero if the drawable is an indexed type"
}
};
......@@ -907,12 +907,12 @@ static ProcArg drawable_offsets_outargs[] =
{
{
GIMP_PDB_INT32,
"offset_x",
"offset-x",
"x offset of drawable"
},
{
GIMP_PDB_INT32,
"offset_y",
"offset-y",
"y offset of drawable"
}
};
......@@ -1556,7 +1556,7 @@ static ProcArg drawable_mask_bounds_outargs[] =
{
{
GIMP_PDB_INT32,
"non_empty",
"non-empty",
"TRUE if there is a selection"
},
{
......@@ -1648,7 +1648,7 @@ static ProcArg drawable_mask_intersect_outargs[] =
{
{
GIMP_PDB_INT32,
"non_empty",
"non-empty",
"TRUE if the returned area is not empty"
},
{
......@@ -1913,12 +1913,12 @@ static ProcArg drawable_get_pixel_inargs[] =
},
{
GIMP_PDB_INT32,
"x_coord",
"x-coord",
"The x coordinate"
},
{
GIMP_PDB_INT32,
"y_coord",
"y-coord",
"The y coordinate"
}
};
......@@ -1927,7 +1927,7 @@ static ProcArg drawable_get_pixel_outargs[] =
{
{
GIMP_PDB_INT32,
"num_channels",
"num-channels",
"The number of channels for the pixel"
},
{
......@@ -2021,17 +2021,17 @@ static ProcArg drawable_set_pixel_inargs[] =
},
{
GIMP_PDB_INT32,
"x_coord",
"x-coord",
"The x coordinate"
},
{