dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgimp, plug-ins: Remove n_drawables parameter from gimp_file_save ()

Browse source
This commit is contained in:
Alx Sa 2024-05-02 13:06:18 +00:00
parent 443947c6aa
commit 3260299f4a
9 changed files with 25 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/pdb/file-cmds.c
View file

@ -234,7 +234,7 @@ file_save_invoker (GimpProcedure *procedure,
GimpProcedure *proc;
gint i;
file = g_value_get_object (gimp_value_array_index (args, 4));
file = g_value_get_object (gimp_value_array_index (args, 2));
file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
GIMP_FILE_PROCEDURE_GROUP_SAVE,
@ -259,12 +259,8 @@ file_save_invoker (GimpProcedure *procedure,
gimp_value_array_index (new_args, 1));
g_value_transform (gimp_value_array_index (args, 2),
gimp_value_array_index (new_args, 2));
g_value_transform (gimp_value_array_index (args, 3),
gimp_value_array_index (new_args, 3));
g_value_transform (gimp_value_array_index (args, 4),
gimp_value_array_index (new_args, 4));
for (i = 5; i < proc->num_args; i++)
for (i = 3; i < proc->num_args; i++)
if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
g_value_set_static_string (gimp_value_array_index (new_args, i), "");
@ -514,18 +510,6 @@ register_file_procs (GimpPDB *pdb)
"Input image",
FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("num-drawables",
"num drawables",
"The number of drawables to save",
1, G_MAXINT32, 1,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_object_array ("drawables",
"drawables",
"Drawables to save",
GIMP_TYPE_ITEM,
GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
gimp_procedure_add_argument (procedure,
g_param_spec_object ("file",
"file",

14
app/xcf/xcf.c
View file

@ -156,18 +156,6 @@ xcf_init (Gimp *gimp)
"Input image",
FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_int ("num-drawables",
"Num drawables",
"Number of drawables",
0, G_MAXINT, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_object_array ("drawables",
"Drawables",
"Selected drawables",
GIMP_TYPE_DRAWABLE,
GIMP_PARAM_READWRITE | GIMP_PARAM_NO_VALIDATE));
gimp_procedure_add_argument (procedure,
g_param_spec_object ("file",
"File",
@ -475,7 +463,7 @@ xcf_save_invoker (GimpProcedure *procedure,
gimp_set_busy (gimp);
image = g_value_get_object (gimp_value_array_index (args, 1));
file = g_value_get_object (gimp_value_array_index (args, 4));
file = g_value_get_object (gimp_value_array_index (args, 2));
output = G_OUTPUT_STREAM (g_file_replace (file,
NULL, FALSE, G_FILE_CREATE_NONE,

2
gimp-data

@ -1 +1 @@
Subproject commit e9762d29e2730786b313663dfba491b8da348e89
Subproject commit e94404c35417e707ddabb0c5818f2dd099fb6400

13
libgimp/gimpfile_pdb.c
View file

@ -178,8 +178,6 @@ gimp_file_load_layers (GimpRunMode run_mode,
* gimp_file_save:
* @run_mode: The run mode.
* @image: Input image.
* @num_drawables: The number of drawables to save.
* @drawables: (array length=num_drawables) (element-type GimpItem): Drawables to save.
* @file: The file to save the image in.
*
* Saves a file by extension.
@ -190,11 +188,9 @@ gimp_file_load_layers (GimpRunMode run_mode,
* Returns: TRUE on success.
**/
gboolean
gimp_file_save (GimpRunMode run_mode,
GimpImage *image,
gint num_drawables,
const GimpItem **drawables,
GFile *file)
gimp_file_save (GimpRunMode run_mode,
GimpImage *image,
GFile *file)
{
GimpValueArray *args;
GimpValueArray *return_vals;
@ -203,11 +199,8 @@ gimp_file_save (GimpRunMode run_mode,
args = gimp_value_array_new_from_types (NULL,
GIMP_TYPE_RUN_MODE, run_mode,
GIMP_TYPE_IMAGE, image,
G_TYPE_INT, num_drawables,
GIMP_TYPE_OBJECT_ARRAY, NULL,
G_TYPE_FILE, file,
G_TYPE_NONE);
gimp_value_set_object_array (gimp_value_array_index (args, 3), GIMP_TYPE_ITEM, (GObject **) drawables, num_drawables);
return_vals = _gimp_pdb_run_procedure_array (gimp_get_pdb (),
"gimp-file-save",

30
libgimp/gimpfile_pdb.h
View file

@ -32,22 +32,20 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
GimpImage* gimp_file_load (GimpRunMode run_mode,
GFile *file);
GimpLayer* gimp_file_load_layer (GimpRunMode run_mode,
GimpImage *image,
GFile *file);
GimpLayer** gimp_file_load_layers (GimpRunMode run_mode,
GimpImage *image,
GFile *file,
gint *num_layers);
gboolean gimp_file_save (GimpRunMode run_mode,
GimpImage *image,
gint num_drawables,
const GimpItem **drawables,
GFile *file);
gboolean gimp_file_save_thumbnail (GimpImage *image,
GFile *file);
GimpImage* gimp_file_load (GimpRunMode run_mode,
GFile *file);
GimpLayer* gimp_file_load_layer (GimpRunMode run_mode,
GimpImage *image,
GFile *file);
GimpLayer** gimp_file_load_layers (GimpRunMode run_mode,
GimpImage *image,
GFile *file,
gint *num_layers);
gboolean gimp_file_save (GimpRunMode run_mode,
GimpImage *image,
GFile *file);
gboolean gimp_file_save_thumbnail (GimpImage *image,
GFile *file);
G_END_DECLS

14
pdb/groups/file.pdb
View file

@ -231,12 +231,6 @@ HELP
desc => 'The run mode' },
{ name => 'image', type => 'image',
desc => 'Input image' },
{ name => 'drawables', type => 'itemarray',
desc => 'Drawables to save',
no_validate => 1,
array => { name => 'num_drawables',
type => '1 <= int32',
desc => "The number of drawables to save" } },
{ name => 'file', type => 'file',
desc => 'The file to save the image in' }
);
@ -253,7 +247,7 @@ HELP
GimpProcedure *proc;
gint i;
file = g_value_get_object (gimp_value_array_index (args, 4));
file = g_value_get_object (gimp_value_array_index (args, 2));
file_proc = gimp_plug_in_manager_file_procedure_find (gimp->plug_in_manager,
GIMP_FILE_PROCEDURE_GROUP_SAVE,
@ -278,12 +272,8 @@ HELP
gimp_value_array_index (new_args, 1));
g_value_transform (gimp_value_array_index (args, 2),
gimp_value_array_index (new_args, 2));
g_value_transform (gimp_value_array_index (args, 3),
gimp_value_array_index (new_args, 3));
g_value_transform (gimp_value_array_index (args, 4),
gimp_value_array_index (new_args, 4));
for (i = 5; i < proc->num_args; i++)
for (i = 3; i < proc->num_args; i++)
if (G_IS_PARAM_SPEC_STRING (proc->args[i]))
g_value_set_static_string (gimp_value_array_index (new_args, i), "");

6
plug-ins/common/file-compressor.c
View file

@ -448,11 +448,7 @@ export_image (const CompressorEntry *compressor,
tmp_file = gimp_temp_file (ext + 1);
if (! (gimp_file_save (run_mode,
image,
n_drawables,
(const GimpItem **) drawables,
tmp_file) &&
if (! (gimp_file_save (run_mode, image, tmp_file) &&
valid_file (tmp_file)))
{
g_file_delete (tmp_file, NULL, NULL);

4
plug-ins/common/mail.c
View file

@ -328,9 +328,7 @@ send_image (GObject *config,
tmpfile = gimp_temp_file (ext + 1);
tmpname = g_file_get_path (tmpfile);
if (! (gimp_file_save (run_mode, image, n_drawables,
(const GimpItem **) drawables,
tmpfile) &&
if (! (gimp_file_save (run_mode, image, tmpfile) &&
valid_file (tmpfile)))
{
goto error;

2
plug-ins/script-fu/scripts/test/contactsheet.scm
View file

@ -268,7 +268,6 @@
(gimp-file-save
RUN-NONINTERACTIVE
sheet-img
1 (vector sheet-layer)
(string-append dir DIR-SEPARATOR
"index" (number->string sheet-num) ".jpg")
)
@ -293,7 +292,6 @@
(gimp-file-save
RUN-NONINTERACTIVE
sheet-img
1 (vector sheet-layer)
(string-append dir DIR-SEPARATOR
"index" (number->string sheet-num) ".jpg")
)