Update upstream
This commit is contained in:
@ -5101,7 +5101,7 @@ register_image_procs (PikaPDB *pdb)
|
||||
"pika-image-get-imported-file");
|
||||
pika_procedure_set_static_help (procedure,
|
||||
"Returns the imported file for the specified image.",
|
||||
"This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Gimp format, this procedure returns %NULL.",
|
||||
"This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Pika format, this procedure returns %NULL.",
|
||||
NULL);
|
||||
pika_procedure_set_static_attribution (procedure,
|
||||
"Eric Grivel <pika@lumenssolutions.com>",
|
||||
|
@ -1297,7 +1297,10 @@ vectors_export_to_file_invoker (PikaProcedure *procedure,
|
||||
|
||||
if (success)
|
||||
{
|
||||
GList *vectors_list = g_list_prepend (NULL, vectors);
|
||||
GList *vectors_list = NULL;
|
||||
|
||||
if (vectors != NULL)
|
||||
vectors_list = g_list_prepend (vectors_list, vectors);
|
||||
|
||||
success = pika_vectors_export_file (image, vectors_list, file, error);
|
||||
|
||||
@ -1327,7 +1330,10 @@ vectors_export_to_string_invoker (PikaProcedure *procedure,
|
||||
|
||||
if (success)
|
||||
{
|
||||
GList *vectors_list = g_list_prepend (NULL, vectors);
|
||||
GList *vectors_list = NULL;
|
||||
|
||||
if (vectors != NULL)
|
||||
vectors_list = g_list_prepend (vectors_list, vectors);
|
||||
|
||||
string = pika_vectors_export_string (image, vectors_list);
|
||||
g_list_free (vectors_list);
|
||||
@ -2440,7 +2446,7 @@ register_vectors_procs (PikaPDB *pdb)
|
||||
"pika-vectors-export-to-file");
|
||||
pika_procedure_set_static_help (procedure,
|
||||
"save a path as an SVG file.",
|
||||
"This procedure creates an SVG file to save a Vectors object, that is, a path. The resulting file can be edited using a vector graphics application, or later reloaded into PIKA. If you pass 0 as the 'vectors' argument, then all paths in the image will be exported.",
|
||||
"This procedure creates an SVG file to save a Vectors object, that is, a path. The resulting file can be edited using a vector graphics application, or later reloaded into PIKA. Pass %NULL as the 'vectors' argument to export all paths in the image.",
|
||||
NULL);
|
||||
pika_procedure_set_static_attribution (procedure,
|
||||
"Bill Skaggs <weskaggs@primate.ucdavis.edu>",
|
||||
@ -2461,7 +2467,7 @@ register_vectors_procs (PikaPDB *pdb)
|
||||
pika_procedure_add_argument (procedure,
|
||||
pika_param_spec_vectors ("vectors",
|
||||
"vectors",
|
||||
"The vectors object to be saved, or 0 for all in the image",
|
||||
"The vectors object to export, or %NULL for all in the image",
|
||||
FALSE,
|
||||
PIKA_PARAM_READWRITE | PIKA_PARAM_NO_VALIDATE));
|
||||
pika_pdb_register_procedure (pdb, procedure);
|
||||
@ -2475,7 +2481,7 @@ register_vectors_procs (PikaPDB *pdb)
|
||||
"pika-vectors-export-to-string");
|
||||
pika_procedure_set_static_help (procedure,
|
||||
"Save a path as an SVG string.",
|
||||
"This procedure works like 'pika-vectors-export-to-file' but creates a string rather than a file. The contents are a NUL-terminated string that holds a complete XML document. If you pass 0 as the 'vectors' argument, then all paths in the image will be exported.",
|
||||
"This procedure works like 'pika-vectors-export-to-file' but creates a string rather than a file. The string is NULL-terminated and holds a complete XML document. Pass %NULL as the 'vectors' argument to export all paths in the image.",
|
||||
NULL);
|
||||
pika_procedure_set_static_attribution (procedure,
|
||||
"Bill Skaggs <weskaggs@primate.ucdavis.edu>",
|
||||
@ -2490,7 +2496,7 @@ register_vectors_procs (PikaPDB *pdb)
|
||||
pika_procedure_add_argument (procedure,
|
||||
pika_param_spec_vectors ("vectors",
|
||||
"vectors",
|
||||
"The vectors object to save, or 0 for all in the image",
|
||||
"The vectors object to export, or %NULL for all in the image",
|
||||
FALSE,
|
||||
PIKA_PARAM_READWRITE | PIKA_PARAM_NO_VALIDATE));
|
||||
pika_procedure_add_return_value (procedure,
|
||||
|
Reference in New Issue
Block a user