dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed GIMP_PDB_PATH to GIMP_PDB_VECTORS and add the former as an alias 

2005-12-29  Michael Natterer  <mitch@gimp.org>

	* libgimpbase/gimpbaseenums.[ch] (enum GimpPDBArgType): renamed
	GIMP_PDB_PATH to GIMP_PDB_VECTORS and add the former as an alias
	for the latter.

	* libgimp/gimp.h (union _GimpParamData): added back d_path member
	to maintian source compatibility.

	* tools/pdbgen/pdb.pl
	* libgimp/gimp.c
	* app/pdb/procedural_db.c
	* app/plug-in/plug-in-params.c
	* libgimpbase/gimpprotocol.[ch]
	* plug-ins/pygimp/pygimp-pdb.c
	* plug-ins/script-fu/siod-wrapper.c: s/GIMP_PDB_PATH/GIMP_PDB_VECTORS/

	* app/pdb/image_cmds.c
	* app/pdb/procedural_db_cmds.c
	* app/pdb/vectors_cmds.c
	* libgimp/gimpimage_pdb.c
	* libgimp/gimpvectors_pdb.c
	* tools/pdbgen/enums.pl: regenerated.
This commit is contained in:
Michael Natterer 2005-12-29 01:07:02 +00:00 committed by Michael Natterer
parent 949fa77a46
commit a0d231b33c
22 changed files with 117 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
2005-12-29 Michael Natterer <mitch@gimp.org>
* libgimpbase/gimpbaseenums.[ch] (enum GimpPDBArgType): renamed
GIMP_PDB_PATH to GIMP_PDB_VECTORS and add the former as an alias
for the latter.
* libgimp/gimp.h (union _GimpParamData): added back d_path member
to maintian source compatibility.
* tools/pdbgen/pdb.pl
* libgimp/gimp.c
* app/pdb/procedural_db.c
* app/plug-in/plug-in-params.c
* libgimpbase/gimpprotocol.[ch]
* plug-ins/pygimp/pygimp-pdb.c
* plug-ins/script-fu/siod-wrapper.c: s/GIMP_PDB_PATH/GIMP_PDB_VECTORS/
* app/pdb/image_cmds.c
* app/pdb/procedural_db_cmds.c
* app/pdb/vectors_cmds.c
* libgimp/gimpimage_pdb.c
* libgimp/gimpvectors_pdb.c
* tools/pdbgen/enums.pl: regenerated.
2005-12-29 Simon Budig <simon@gimp.org>
* tools/pdbgen/pdb/vectors.pdb:

4
app/pdb/gimp-pdb.c
View File

@ -461,7 +461,7 @@ procedural_db_run_proc (Gimp *gimp,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
params[i].value.pdb_int = (gint32) va_arg (args, gint);
break;
@ -566,7 +566,7 @@ procedural_db_destroy_args (Argument *args,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
break;
case GIMP_PDB_PARASITE:

4
app/pdb/gimppdb.c
View File

@ -461,7 +461,7 @@ procedural_db_run_proc (Gimp *gimp,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
params[i].value.pdb_int = (gint32) va_arg (args, gint);
break;
@ -566,7 +566,7 @@ procedural_db_destroy_args (Argument *args,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
break;
case GIMP_PDB_PARASITE:

4
app/pdb/gimpprocedure.c
View File

@ -461,7 +461,7 @@ procedural_db_run_proc (Gimp *gimp,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
params[i].value.pdb_int = (gint32) va_arg (args, gint);
break;
@ -566,7 +566,7 @@ procedural_db_destroy_args (Argument *args,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
break;
case GIMP_PDB_PARASITE:

16
app/pdb/image_cmds.c
View File

@ -2190,7 +2190,7 @@ static ProcArg image_raise_vectors_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object to raise"
}
@ -2246,7 +2246,7 @@ static ProcArg image_lower_vectors_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object to lower"
}
@ -2302,7 +2302,7 @@ static ProcArg image_raise_vectors_to_top_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object to raise to top"
}
@ -2358,7 +2358,7 @@ static ProcArg image_lower_vectors_to_bottom_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object to lower to bottom"
}
@ -2539,7 +2539,7 @@ static ProcArg image_remove_vectors_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -3701,7 +3701,7 @@ static ProcArg image_get_active_vectors_inargs[] =
static ProcArg image_get_active_vectors_outargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"active-vectors",
"The active vectors"
}
@ -3757,7 +3757,7 @@ static ProcArg image_set_active_vectors_inargs[] =
"The image"
},
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"active-vectors",
"The new image active vectors"
}
@ -4920,7 +4920,7 @@ static ProcArg image_get_vectors_by_tattoo_inargs[] =
static ProcArg image_get_vectors_by_tattoo_outargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors with the specified tattoo"
}

4
app/pdb/procedural_db.c
View File

@ -461,7 +461,7 @@ procedural_db_run_proc (Gimp *gimp,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
params[i].value.pdb_int = (gint32) va_arg (args, gint);
break;
@ -566,7 +566,7 @@ procedural_db_destroy_args (Argument *args,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
break;
case GIMP_PDB_PARASITE:

4
app/pdb/procedural_db_cmds.c
View File

@ -484,7 +484,7 @@ static ProcArg procedural_db_proc_arg_outargs[] =
{
GIMP_PDB_INT32,
"arg-type",
"The type of argument { GIMP_PDB_INT32 (0), GIMP_PDB_INT16 (1), GIMP_PDB_INT8 (2), GIMP_PDB_FLOAT (3), GIMP_PDB_STRING (4), GIMP_PDB_INT32ARRAY (5), GIMP_PDB_INT16ARRAY (6), GIMP_PDB_INT8ARRAY (7), GIMP_PDB_FLOATARRAY (8), GIMP_PDB_STRINGARRAY (9), GIMP_PDB_COLOR (10), GIMP_PDB_REGION (11), GIMP_PDB_DISPLAY (12), GIMP_PDB_IMAGE (13), GIMP_PDB_LAYER (14), GIMP_PDB_CHANNEL (15), GIMP_PDB_DRAWABLE (16), GIMP_PDB_SELECTION (17), GIMP_PDB_BOUNDARY (18), GIMP_PDB_PATH (19), GIMP_PDB_PARASITE (20), GIMP_PDB_STATUS (21) }"
"The type of argument { GIMP_PDB_INT32 (0), GIMP_PDB_INT16 (1), GIMP_PDB_INT8 (2), GIMP_PDB_FLOAT (3), GIMP_PDB_STRING (4), GIMP_PDB_INT32ARRAY (5), GIMP_PDB_INT16ARRAY (6), GIMP_PDB_INT8ARRAY (7), GIMP_PDB_FLOATARRAY (8), GIMP_PDB_STRINGARRAY (9), GIMP_PDB_COLOR (10), GIMP_PDB_REGION (11), GIMP_PDB_DISPLAY (12), GIMP_PDB_IMAGE (13), GIMP_PDB_LAYER (14), GIMP_PDB_CHANNEL (15), GIMP_PDB_DRAWABLE (16), GIMP_PDB_SELECTION (17), GIMP_PDB_BOUNDARY (18), GIMP_PDB_VECTORS (19), GIMP_PDB_PARASITE (20), GIMP_PDB_STATUS (21), GIMP_PDB_PATH (GIMP_PDB_VECTORS) }"
},
{
GIMP_PDB_STRING,
@ -592,7 +592,7 @@ static ProcArg procedural_db_proc_val_outargs[] =
{
GIMP_PDB_INT32,
"val-type",
"The type of return value { GIMP_PDB_INT32 (0), GIMP_PDB_INT16 (1), GIMP_PDB_INT8 (2), GIMP_PDB_FLOAT (3), GIMP_PDB_STRING (4), GIMP_PDB_INT32ARRAY (5), GIMP_PDB_INT16ARRAY (6), GIMP_PDB_INT8ARRAY (7), GIMP_PDB_FLOATARRAY (8), GIMP_PDB_STRINGARRAY (9), GIMP_PDB_COLOR (10), GIMP_PDB_REGION (11), GIMP_PDB_DISPLAY (12), GIMP_PDB_IMAGE (13), GIMP_PDB_LAYER (14), GIMP_PDB_CHANNEL (15), GIMP_PDB_DRAWABLE (16), GIMP_PDB_SELECTION (17), GIMP_PDB_BOUNDARY (18), GIMP_PDB_PATH (19), GIMP_PDB_PARASITE (20), GIMP_PDB_STATUS (21) }"
"The type of return value { GIMP_PDB_INT32 (0), GIMP_PDB_INT16 (1), GIMP_PDB_INT8 (2), GIMP_PDB_FLOAT (3), GIMP_PDB_STRING (4), GIMP_PDB_INT32ARRAY (5), GIMP_PDB_INT16ARRAY (6), GIMP_PDB_INT8ARRAY (7), GIMP_PDB_FLOATARRAY (8), GIMP_PDB_STRINGARRAY (9), GIMP_PDB_COLOR (10), GIMP_PDB_REGION (11), GIMP_PDB_DISPLAY (12), GIMP_PDB_IMAGE (13), GIMP_PDB_LAYER (14), GIMP_PDB_CHANNEL (15), GIMP_PDB_DRAWABLE (16), GIMP_PDB_SELECTION (17), GIMP_PDB_BOUNDARY (18), GIMP_PDB_VECTORS (19), GIMP_PDB_PARASITE (20), GIMP_PDB_STATUS (21), GIMP_PDB_PATH (GIMP_PDB_VECTORS) }"
},
{
GIMP_PDB_STRING,

30
app/pdb/vectors_cmds.c
View File

@ -123,7 +123,7 @@ vectors_get_strokes_invoker (Gimp *gimp,
static ProcArg vectors_get_strokes_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -192,7 +192,7 @@ vectors_get_image_invoker (Gimp *gimp,
static ProcArg vectors_get_image_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -256,7 +256,7 @@ vectors_get_linked_invoker (Gimp *gimp,
static ProcArg vectors_get_linked_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -316,7 +316,7 @@ vectors_set_linked_invoker (Gimp *gimp,
static ProcArg vectors_set_linked_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -376,7 +376,7 @@ vectors_get_visible_invoker (Gimp *gimp,
static ProcArg vectors_get_visible_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -436,7 +436,7 @@ vectors_set_visible_invoker (Gimp *gimp,
static ProcArg vectors_set_visible_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -496,7 +496,7 @@ vectors_get_name_invoker (Gimp *gimp,
static ProcArg vectors_get_name_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -559,7 +559,7 @@ vectors_set_name_invoker (Gimp *gimp,
static ProcArg vectors_set_name_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -619,7 +619,7 @@ vectors_get_tattoo_invoker (Gimp *gimp,
static ProcArg vectors_get_tattoo_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
}
@ -679,7 +679,7 @@ vectors_set_tattoo_invoker (Gimp *gimp,
static ProcArg vectors_set_tattoo_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -755,7 +755,7 @@ vectors_stroke_get_length_invoker (Gimp *gimp,
static ProcArg vectors_stroke_get_length_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -831,7 +831,7 @@ vectors_stroke_remove_invoker (Gimp *gimp,
static ProcArg vectors_stroke_remove_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -911,7 +911,7 @@ vectors_stroke_translate_invoker (Gimp *gimp,
static ProcArg vectors_stroke_translate_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -1001,7 +1001,7 @@ vectors_stroke_scale_invoker (Gimp *gimp,
static ProcArg vectors_stroke_scale_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},
@ -1114,7 +1114,7 @@ vectors_stroke_interpolate_invoker (Gimp *gimp,
static ProcArg vectors_stroke_interpolate_inargs[] =
{
{
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
"vectors",
"The vectors object"
},

10
app/plug-in/plug-in-params.c
View File

@ -166,8 +166,8 @@ plug_in_params_to_args (GPParam *params,
case GIMP_PDB_BOUNDARY:
args[i].value.pdb_int = params[i].data.d_boundary;
break;
case GIMP_PDB_PATH:
args[i].value.pdb_int = params[i].data.d_path;
case GIMP_PDB_VECTORS:
args[i].value.pdb_int = params[i].data.d_vectors;
break;
case GIMP_PDB_PARASITE:
if (full_copy)
@ -318,8 +318,8 @@ plug_in_args_to_params (Argument *args,
case GIMP_PDB_BOUNDARY:
params[i].data.d_boundary = args[i].value.pdb_int;
break;
case GIMP_PDB_PATH:
params[i].data.d_path = args[i].value.pdb_int;
case GIMP_PDB_VECTORS:
params[i].data.d_vectors = args[i].value.pdb_int;
break;
case GIMP_PDB_PARASITE:
if (full_copy)
@ -418,7 +418,7 @@ plug_in_params_destroy (GPParam *params,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
break;
case GIMP_PDB_PARASITE:
if (params[i].data.d_parasite.data)

4
libgimp/gimp.c
View File

@ -730,7 +730,7 @@ gimp_run_procedure (const gchar *name,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
case GIMP_PDB_STATUS:
(void) va_arg (args, gint);
break;
@ -846,7 +846,7 @@ gimp_run_procedure (const gchar *name,
case GIMP_PDB_BOUNDARY:
params[i].data.d_boundary = va_arg (args, gint32);
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
params[i].data.d_vectors = va_arg (args, gint32);
break;
case GIMP_PDB_PARASITE:

1
libgimp/gimp.h
View File

@ -149,6 +149,7 @@ union _GimpParamData
gint32 d_drawable;
gint32 d_selection;
gint32 d_boundary;
gint32 d_path; /* deprecated */
gint32 d_vectors;
gint32 d_unit;
GimpParasite d_parasite;

12
libgimp/gimpimage_pdb.c
View File

@ -1122,7 +1122,7 @@ gimp_image_raise_vectors (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-raise-vectors",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
@ -1158,7 +1158,7 @@ gimp_image_lower_vectors (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-lower-vectors",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
@ -1195,7 +1195,7 @@ gimp_image_raise_vectors_to_top (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-raise-vectors-to-top",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
@ -1232,7 +1232,7 @@ gimp_image_lower_vectors_to_bottom (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-lower-vectors-to-bottom",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
@ -1337,7 +1337,7 @@ gimp_image_remove_vectors (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-remove-vectors",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
@ -1927,7 +1927,7 @@ gimp_image_set_active_vectors (gint32 image_ID,
return_vals = gimp_run_procedure ("gimp-image-set-active-vectors",
&nreturn_vals,
GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_PATH, active_vectors_ID,
GIMP_PDB_VECTORS, active_vectors_ID,
GIMP_PDB_END);
success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;

30
libgimp/gimpvectors_pdb.c
View File

@ -51,7 +51,7 @@ gimp_vectors_get_strokes (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-get-strokes",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
*num_strokes = 0;
@ -90,7 +90,7 @@ gimp_vectors_get_image (gint32 vectors_ID)
return_vals = gimp_run_procedure ("gimp-vectors-get-image",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@ -122,7 +122,7 @@ gimp_vectors_get_linked (gint32 vectors_ID)
return_vals = gimp_run_procedure ("gimp-vectors-get-linked",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@ -156,7 +156,7 @@ gimp_vectors_set_linked (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-set-linked",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, linked,
GIMP_PDB_END);
@ -188,7 +188,7 @@ gimp_vectors_get_visible (gint32 vectors_ID)
return_vals = gimp_run_procedure ("gimp-vectors-get-visible",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@ -222,7 +222,7 @@ gimp_vectors_set_visible (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-set-visible",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, visible,
GIMP_PDB_END);
@ -254,7 +254,7 @@ gimp_vectors_get_name (gint32 vectors_ID)
return_vals = gimp_run_procedure ("gimp-vectors-get-name",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@ -288,7 +288,7 @@ gimp_vectors_set_name (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-set-name",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_STRING, name,
GIMP_PDB_END);
@ -320,7 +320,7 @@ gimp_vectors_get_tattoo (gint32 vectors_ID)
return_vals = gimp_run_procedure ("gimp-vectors-get-tattoo",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_END);
if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
@ -354,7 +354,7 @@ gimp_vectors_set_tattoo (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-set-tattoo",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, tattoo,
GIMP_PDB_END);
@ -390,7 +390,7 @@ gimp_vectors_stroke_get_length (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-stroke-get-length",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, stroke_id,
GIMP_PDB_FLOAT, prescision,
GIMP_PDB_END);
@ -426,7 +426,7 @@ gimp_vectors_stroke_remove (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-stroke-remove",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, stroke_id,
GIMP_PDB_END);
@ -464,7 +464,7 @@ gimp_vectors_stroke_translate (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-stroke-translate",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, stroke_id,
GIMP_PDB_INT32, off_x,
GIMP_PDB_INT32, off_y,
@ -504,7 +504,7 @@ gimp_vectors_stroke_scale (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-stroke-scale",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, stroke_id,
GIMP_PDB_FLOAT, scale_x,
GIMP_PDB_FLOAT, scale_y,
@ -546,7 +546,7 @@ gimp_vectors_stroke_interpolate (gint32 vectors_ID,
return_vals = gimp_run_procedure ("gimp-vectors-stroke-interpolate",
&nreturn_vals,
GIMP_PDB_PATH, vectors_ID,
GIMP_PDB_VECTORS, vectors_ID,
GIMP_PDB_INT32, stroke_id,
GIMP_PDB_FLOAT, prescision,
GIMP_PDB_END);

6
libgimpbase/gimpbaseenums.c
View File

@ -749,10 +749,11 @@ gimp_pdb_arg_type_get_type (void)
{ GIMP_PDB_DRAWABLE, "GIMP_PDB_DRAWABLE", "drawable" },
{ GIMP_PDB_SELECTION, "GIMP_PDB_SELECTION", "selection" },
{ GIMP_PDB_BOUNDARY, "GIMP_PDB_BOUNDARY", "boundary" },
{ GIMP_PDB_PATH, "GIMP_PDB_PATH", "path" },
{ GIMP_PDB_VECTORS, "GIMP_PDB_VECTORS", "vectors" },
{ GIMP_PDB_PARASITE, "GIMP_PDB_PARASITE", "parasite" },
{ GIMP_PDB_STATUS, "GIMP_PDB_STATUS", "status" },
{ GIMP_PDB_END, "GIMP_PDB_END", "end" },
{ GIMP_PDB_PATH, "GIMP_PDB_PATH", "path" },
{ 0, NULL, NULL }
};
@ -777,10 +778,11 @@ gimp_pdb_arg_type_get_type (void)
{ GIMP_PDB_DRAWABLE, "GIMP_PDB_DRAWABLE", NULL },
{ GIMP_PDB_SELECTION, "GIMP_PDB_SELECTION", NULL },
{ GIMP_PDB_BOUNDARY, "GIMP_PDB_BOUNDARY", NULL },
{ GIMP_PDB_PATH, "GIMP_PDB_PATH", NULL },
{ GIMP_PDB_VECTORS, "GIMP_PDB_VECTORS", NULL },
{ GIMP_PDB_PARASITE, "GIMP_PDB_PARASITE", NULL },
{ GIMP_PDB_STATUS, "GIMP_PDB_STATUS", NULL },
{ GIMP_PDB_END, "GIMP_PDB_END", NULL },
{ GIMP_PDB_PATH, "GIMP_PDB_PATH", NULL },
{ 0, NULL, NULL }
};

6
libgimpbase/gimpbaseenums.h
View File

@ -348,10 +348,12 @@ typedef enum
GIMP_PDB_DRAWABLE,
GIMP_PDB_SELECTION,
GIMP_PDB_BOUNDARY,
GIMP_PDB_PATH,
GIMP_PDB_VECTORS,
GIMP_PDB_PARASITE,
GIMP_PDB_STATUS,
GIMP_PDB_END
GIMP_PDB_END,
GIMP_PDB_PATH = GIMP_PDB_VECTORS /* deprecated */
} GimpPDBArgType;

10
libgimpbase/gimpprotocol.c
View File

@ -1466,9 +1466,9 @@ _gp_params_read (GIOChannel *channel,
goto cleanup;
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
if (! _gimp_wire_read_int32 (channel,
(guint32 *) &(*params)[i].data.d_path, 1,
(guint32 *) &(*params)[i].data.d_vectors, 1,
user_data))
goto cleanup;
break;
@ -1692,9 +1692,9 @@ _gp_params_write (GIOChannel *channel,
return;
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
if (! _gimp_wire_write_int32 (channel,
(const guint32 *) &params[i].data.d_path, 1,
(const guint32 *) &params[i].data.d_vectors, 1,
user_data))
return;
break;
@ -1761,7 +1761,7 @@ gp_params_destroy (GPParam *params,
case GIMP_PDB_DRAWABLE:
case GIMP_PDB_SELECTION:
case GIMP_PDB_BOUNDARY:
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
case GIMP_PDB_STATUS:
break;

3
libgimpbase/gimpprotocol.h
View File

@ -134,7 +134,8 @@ struct _GPParam
gint32 d_drawable;
gint32 d_selection;
gint32 d_boundary;
gint32 d_path;
gint32 d_path; /* deprecated */
gint32 d_vectors;
struct
{
gchar *name;

4
plug-ins/pygimp/pygimp-pdb.c
View File

@ -284,7 +284,7 @@ pygimp_param_to_tuple(int nparams, const GimpParam *params)
case GIMP_PDB_BOUNDARY:
value = PyInt_FromLong(params[i].data.d_boundary);
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
value = PyInt_FromLong(params[i].data.d_vectors);
break;
case GIMP_PDB_PARASITE:
@ -513,7 +513,7 @@ pygimp_param_from_tuple(PyObject *args, const GimpParamDef *ptype, int nparams)
check(!PyInt_Check(item));
ret[i].data.d_boundary = PyInt_AsLong(item);
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
check(!PyInt_Check(item));
ret[i].data.d_vectors = PyInt_AsLong(item);
break;

6
plug-ins/script-fu/scheme-wrapper.c
View File

@ -843,12 +843,12 @@ marshall_proc_db_call (LISP a)
car (a));
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
if (!TYPEP (car (a), tc_flonum))
success = FALSE;
if (success)
{
args[i].type = GIMP_PDB_PATH;
args[i].type = GIMP_PDB_VECTORS;
args[i].data.d_int32 = get_c_long (car (a));
}
break;
@ -1128,7 +1128,7 @@ marshall_proc_db_call (LISP a)
return my_err ("Boundaries are currently unsupported as return values", NIL);
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
return_val = cons (flocons (values[i + 1].data.d_int32),
return_val);
break;

6
plug-ins/script-fu/siod-wrapper.c
View File

@ -843,12 +843,12 @@ marshall_proc_db_call (LISP a)
car (a));
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
if (!TYPEP (car (a), tc_flonum))
success = FALSE;
if (success)
{
args[i].type = GIMP_PDB_PATH;
args[i].type = GIMP_PDB_VECTORS;
args[i].data.d_int32 = get_c_long (car (a));
}
break;
@ -1128,7 +1128,7 @@ marshall_proc_db_call (LISP a)
return my_err ("Boundaries are currently unsupported as return values", NIL);
break;
case GIMP_PDB_PATH:
case GIMP_PDB_VECTORS:
return_val = cons (flocons (values[i + 1].data.d_int32),
return_val);
break;

12
tools/pdbgen/enums.pl
View File

@ -233,7 +233,7 @@ package Gimp::CodeGen::enums;
GIMP_UNIT_END => '5' }
},
GimpPDBArgType =>
{ contig => 1,
{ contig => 0,
header => 'libgimpbase/gimpbaseenums.h',
symbols => [ qw(GIMP_PDB_INT32 GIMP_PDB_INT16 GIMP_PDB_INT8
GIMP_PDB_FLOAT GIMP_PDB_STRING GIMP_PDB_INT32ARRAY
@ -242,8 +242,9 @@ package Gimp::CodeGen::enums;
GIMP_PDB_COLOR GIMP_PDB_REGION GIMP_PDB_DISPLAY
GIMP_PDB_IMAGE GIMP_PDB_LAYER GIMP_PDB_CHANNEL
GIMP_PDB_DRAWABLE GIMP_PDB_SELECTION
GIMP_PDB_BOUNDARY GIMP_PDB_PATH GIMP_PDB_PARASITE
GIMP_PDB_STATUS GIMP_PDB_END) ],
GIMP_PDB_BOUNDARY GIMP_PDB_VECTORS
GIMP_PDB_PARASITE GIMP_PDB_STATUS GIMP_PDB_END
GIMP_PDB_PATH) ],
mapping => { GIMP_PDB_INT32 => '0',
GIMP_PDB_INT16 => '1',
GIMP_PDB_INT8 => '2',
@ -263,10 +264,11 @@ package Gimp::CodeGen::enums;
GIMP_PDB_DRAWABLE => '16',
GIMP_PDB_SELECTION => '17',
GIMP_PDB_BOUNDARY => '18',
GIMP_PDB_PATH => '19',
GIMP_PDB_VECTORS => '19',
GIMP_PDB_PARASITE => '20',
GIMP_PDB_STATUS => '21',
GIMP_PDB_END => '22' }
GIMP_PDB_END => '22',
GIMP_PDB_PATH => 'GIMP_PDB_VECTORS' }
},
GimpPDBProcType =>
{ contig => 1,

2
tools/pdbgen/pdb.pl
View File

@ -76,7 +76,7 @@ package Gimp::CodeGen::pdb;
id_func => '(GimpLayerMask *) gimp_item_get_by_ID',
id_ret_func => 'gimp_item_get_ID (GIMP_ITEM ($var))',
check_func => '(GIMP_IS_LAYER_MASK ($var) && ! gimp_item_is_removed (GIMP_ITEM ($var)))' },
vectors => { name => 'PATH',
vectors => { name => 'VECTORS',
type => 'GimpVectors *',
headers => [ qw("vectors/gimpvectors.h") ],
id_func => '(GimpVectors *) gimp_item_get_by_ID',