libgimp, plug-ins: rename gimp_load_procedure_new2() as gimp_load_procedure_new().

All C load procedures are now moved to the new API.
This commit is contained in:
Jehan 2023-08-06 03:21:27 +02:00
parent 136aca3c34
commit 9e2a7e8759
48 changed files with 258 additions and 336 deletions

View File

@ -619,7 +619,6 @@ EXPORTS
gimp_load_procedure_get_thumbnail_loader gimp_load_procedure_get_thumbnail_loader
gimp_load_procedure_get_type gimp_load_procedure_get_type
gimp_load_procedure_new gimp_load_procedure_new
gimp_load_procedure_new2
gimp_load_procedure_set_handles_raw gimp_load_procedure_set_handles_raw
gimp_load_procedure_set_thumbnail_loader gimp_load_procedure_set_thumbnail_loader
gimp_main gimp_main

View File

@ -55,7 +55,6 @@
struct _GimpLoadProcedurePrivate struct _GimpLoadProcedurePrivate
{ {
GimpRunLoadFunc run_func; GimpRunLoadFunc run_func;
GimpRunLoadFunc2 run_func2;
gpointer run_data; gpointer run_data;
GDestroyNotify run_data_destroy; GDestroyNotify run_data_destroy;
@ -180,6 +179,12 @@ gimp_load_procedure_run (GimpProcedure *procedure,
GimpLoadProcedure *load_proc = GIMP_LOAD_PROCEDURE (procedure); GimpLoadProcedure *load_proc = GIMP_LOAD_PROCEDURE (procedure);
GimpValueArray *remaining; GimpValueArray *remaining;
GimpValueArray *return_values; GimpValueArray *return_values;
GimpProcedureConfig *config;
GimpImage *image = NULL;
GimpMetadata *metadata = NULL;
gchar *mimetype = NULL;
GimpMetadataLoadFlags flags = GIMP_METADATA_LOAD_ALL;
GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR;
GimpRunMode run_mode; GimpRunMode run_mode;
GFile *file; GFile *file;
gint i; gint i;
@ -196,15 +201,6 @@ gimp_load_procedure_run (GimpProcedure *procedure,
gimp_value_array_append (remaining, value); gimp_value_array_append (remaining, value);
} }
if (load_proc->priv->run_func2)
{
GimpProcedureConfig *config;
GimpImage *image = NULL;
GimpMetadata *metadata = NULL;
gchar *mimetype = NULL;
GimpMetadataLoadFlags flags = GIMP_METADATA_LOAD_ALL;
GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR;
config = gimp_procedure_create_config (procedure); config = gimp_procedure_create_config (procedure);
mimetype = (gchar *) gimp_file_procedure_get_mime_types (GIMP_FILE_PROCEDURE (procedure)); mimetype = (gchar *) gimp_file_procedure_get_mime_types (GIMP_FILE_PROCEDURE (procedure));
@ -238,7 +234,7 @@ gimp_load_procedure_run (GimpProcedure *procedure,
if (metadata == NULL) if (metadata == NULL)
metadata = gimp_metadata_new (); metadata = gimp_metadata_new ();
return_values = load_proc->priv->run_func2 (procedure, return_values = load_proc->priv->run_func (procedure,
run_mode, run_mode,
file, file,
metadata, &flags, metadata, &flags,
@ -283,16 +279,7 @@ gimp_load_procedure_run (GimpProcedure *procedure,
"by plug-in, it MUST NOT do that!\n", G_STRFUNC); "by plug-in, it MUST NOT do that!\n", G_STRFUNC);
g_object_unref (config); g_object_unref (config);
} g_clear_object (&metadata);
else
{
return_values = load_proc->priv->run_func (procedure,
run_mode,
file,
remaining,
load_proc->priv->run_data);
}
gimp_value_array_unref (remaining); gimp_value_array_unref (remaining);
return return_values; return return_values;
@ -369,53 +356,6 @@ gimp_load_procedure_new (GimpPlugIn *plug_in,
return GIMP_PROCEDURE (procedure); return GIMP_PROCEDURE (procedure);
} }
/**
* gimp_load_procedure_new2:
* @plug_in: a #GimpPlugIn.
* @name: the new procedure's name.
* @proc_type: the new procedure's #GimpPDBProcType.
* @run_func: the run function for the new procedure.
* @run_data: user data passed to @run_func.
* @run_data_destroy: (nullable): free function for @run_data, or %NULL.
*
* Creates a new load procedure named @name which will call @run_func
* when invoked.
*
* See gimp_procedure_new() for information about @proc_type.
*
* Returns: (transfer full): a new #GimpProcedure.
*
* Since: 3.0
**/
GimpProcedure *
gimp_load_procedure_new2 (GimpPlugIn *plug_in,
const gchar *name,
GimpPDBProcType proc_type,
GimpRunLoadFunc2 run_func,
gpointer run_data,
GDestroyNotify run_data_destroy)
{
GimpLoadProcedure *procedure;
g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
g_return_val_if_fail (gimp_is_canonical_identifier (name), NULL);
g_return_val_if_fail (proc_type != GIMP_PDB_PROC_TYPE_INTERNAL, NULL);
g_return_val_if_fail (proc_type != GIMP_PDB_PROC_TYPE_EXTENSION, NULL);
g_return_val_if_fail (run_func != NULL, NULL);
procedure = g_object_new (GIMP_TYPE_LOAD_PROCEDURE,
"plug-in", plug_in,
"name", name,
"procedure-type", proc_type,
NULL);
procedure->priv->run_func2 = run_func;
procedure->priv->run_data = run_data;
procedure->priv->run_data_destroy = run_data_destroy;
return GIMP_PROCEDURE (procedure);
}
/** /**
* gimp_load_procedure_set_handles_raw: * gimp_load_procedure_set_handles_raw:
* @procedure: A load procedure object. * @procedure: A load procedure object.

View File

@ -31,41 +31,30 @@ G_BEGIN_DECLS
/** /**
* GimpRunLoadFunc: * GimpRunLoadFunc:
* @procedure: the #GimpProcedure that runs. * @procedure: the [class@Gimp.Procedure] that runs.
* @run_mode: the #GimpRunMode. * @run_mode: the [enum@RunMode].
* @file: the #GFile to load from. * @file: the [iface@Gio.File] to load from.
* @args: the @procedure's remaining arguments. * @metadata: the [class@Gimp.Metadata] which will be added to the new image.
* @flags: (inout): flags to filter which metadata will be added..
* @config: the @procedure's remaining arguments.
* @run_data: (closure): the run_data given in gimp_load_procedure_new(). * @run_data: (closure): the run_data given in gimp_load_procedure_new().
* *
* The load function is run during the lifetime of the GIMP session, * The load function is run during the lifetime of the GIMP session, each time a
* each time a plug-in load procedure is called. * plug-in load procedure is called.
*
* You are expected to read @file and create a [class@Gimp.Image] out of its
* data. This image will be the first return value.
* @metadata will be filled from metadata from @file if our infrastructure
* supports this format. You may tweak this object, for instance adding metadata
* specific to the format. You can also edit @flags if you need to filter out
* some specific common fields. For instance, it is customary to remove a
* colorspace field with [flags@MetadataLoadFlags] when a profile was added.
* *
* Returns: (transfer full): the @procedure's return values. * Returns: (transfer full): the @procedure's return values.
* *
* Since: 3.0 * Since: 3.0
**/ **/
typedef GimpValueArray * (* GimpRunLoadFunc) (GimpProcedure *procedure, typedef GimpValueArray * (* GimpRunLoadFunc) (GimpProcedure *procedure,
GimpRunMode run_mode,
GFile *file,
const GimpValueArray *args,
gpointer run_data);
/**
* GimpRunLoadFunc2:
* @procedure: the #GimpProcedure that runs.
* @run_mode: the #GimpRunMode.
* @file: the #GFile to load from.
* @config: the @procedure's remaining arguments.
* @run_data: (closure): the run_data given in gimp_load_procedure_new().
*
* The load function is run during the lifetime of the GIMP session,
* each time a plug-in load procedure is called.
*
* Returns: (transfer full): the @procedure's return values.
*
* Since: 3.0
**/
typedef GimpValueArray * (* GimpRunLoadFunc2) (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GFile *file, GFile *file,
GimpMetadata *metadata, GimpMetadata *metadata,
@ -107,12 +96,6 @@ GimpProcedure * gimp_load_procedure_new (GimpPlugIn *plu
GimpRunLoadFunc run_func, GimpRunLoadFunc run_func,
gpointer run_data, gpointer run_data,
GDestroyNotify run_data_destroy); GDestroyNotify run_data_destroy);
GimpProcedure * gimp_load_procedure_new2 (GimpPlugIn *plug_in,
const gchar *name,
GimpPDBProcType proc_type,
GimpRunLoadFunc2 run_func,
gpointer run_data,
GDestroyNotify run_data_destroy);
void gimp_load_procedure_set_handles_raw (GimpLoadProcedure *procedure, void gimp_load_procedure_set_handles_raw (GimpLoadProcedure *procedure,
gboolean handles_raw); gboolean handles_raw);

View File

@ -134,7 +134,7 @@ cel_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
cel_load, NULL, NULL); cel_load, NULL, NULL);

View File

@ -316,7 +316,7 @@ compressor_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, compressor->load_proc)) if (! strcmp (name, compressor->load_proc))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
compressor_load, compressor_load,
(gpointer) compressor, NULL); (gpointer) compressor, NULL);

View File

@ -107,7 +107,7 @@ desktop_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
desktop_load, NULL, NULL); desktop_load, NULL, NULL);

View File

@ -169,7 +169,7 @@ dicom_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
dicom_load, NULL, NULL); dicom_load, NULL, NULL);

View File

@ -130,7 +130,7 @@ farbfeld_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
farbfeld_load, NULL, NULL); farbfeld_load, NULL, NULL);

View File

@ -194,7 +194,7 @@ goat_create_procedure (GimpPlugIn *plug_in,
if (! g_strcmp0 (name, format->load_proc)) if (! g_strcmp0 (name, format->load_proc))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
goat_load, goat_load,
(gpointer) format, NULL); (gpointer) format, NULL);

View File

@ -171,7 +171,7 @@ gif_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
gif_load, NULL, NULL); gif_load, NULL, NULL);

View File

@ -187,7 +187,7 @@ heif_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
heif_load, NULL, NULL); heif_load, NULL, NULL);
@ -305,7 +305,7 @@ heif_create_procedure (GimpPlugIn *plug_in,
#if LIBHEIF_HAVE_VERSION(1,8,0) #if LIBHEIF_HAVE_VERSION(1,8,0)
else if (! strcmp (name, LOAD_PROC_AV1)) else if (! strcmp (name, LOAD_PROC_AV1))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
heif_load, NULL, NULL); heif_load, NULL, NULL);

View File

@ -140,7 +140,7 @@ iff_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
iff_load, NULL, NULL); iff_load, NULL, NULL);

View File

@ -182,7 +182,7 @@ jp2_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_JP2_PROC)) if (! strcmp (name, LOAD_JP2_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
jp2_load, NULL, NULL); jp2_load, NULL, NULL);
@ -216,7 +216,7 @@ jp2_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_J2K_PROC)) else if (! strcmp (name, LOAD_J2K_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
jp2_load, NULL, NULL); jp2_load, NULL, NULL);

View File

@ -135,7 +135,7 @@ jpegxl_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
jpegxl_load, NULL, NULL); jpegxl_load, NULL, NULL);

View File

@ -205,7 +205,7 @@ pcx_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
pcx_load, NULL, NULL); pcx_load, NULL, NULL);
@ -236,7 +236,7 @@ pcx_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_PROC_DCX)) else if (! strcmp (name, LOAD_PROC_DCX))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
dcx_load, NULL, NULL); dcx_load, NULL, NULL);

View File

@ -312,7 +312,7 @@ pdf_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
pdf_load, NULL, NULL); pdf_load, NULL, NULL);

View File

@ -164,7 +164,7 @@ pix_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
pix_load, NULL, NULL); pix_load, NULL, NULL);

View File

@ -176,7 +176,7 @@ png_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
png_load, NULL, NULL); png_load, NULL, NULL);

View File

@ -311,7 +311,7 @@ pnm_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
pnm_load, NULL, NULL); pnm_load, NULL, NULL);

View File

@ -330,7 +330,7 @@ ps_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PS_PROC) || if (! strcmp (name, LOAD_PS_PROC) ||
! strcmp (name, LOAD_EPS_PROC)) ! strcmp (name, LOAD_EPS_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
ps_load, NULL, NULL); ps_load, NULL, NULL);

View File

@ -660,7 +660,7 @@ psp_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
psp_load, NULL, NULL); psp_load, NULL, NULL);

View File

@ -132,7 +132,7 @@ qoi_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
qoi_load, NULL, NULL); qoi_load, NULL, NULL);

View File

@ -329,7 +329,7 @@ raw_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
raw_load, NULL, NULL); raw_load, NULL, NULL);
@ -409,7 +409,7 @@ raw_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_HGT_PROC)) else if (! strcmp (name, LOAD_HGT_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
raw_load, NULL, NULL); raw_load, NULL, NULL);

View File

@ -270,7 +270,7 @@ sunras_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
sunras_load, NULL, NULL); sunras_load, NULL, NULL);

View File

@ -153,7 +153,7 @@ svg_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
svg_load, NULL, NULL); svg_load, NULL, NULL);

View File

@ -256,7 +256,7 @@ tga_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
tga_load, NULL, NULL); tga_load, NULL, NULL);

View File

@ -111,7 +111,7 @@ wbmp_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
wbmp_load, NULL, NULL); wbmp_load, NULL, NULL);

View File

@ -148,7 +148,7 @@ wmf_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
wmf_load, NULL, NULL); wmf_load, NULL, NULL);

View File

@ -155,7 +155,7 @@ xbm_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
xbm_load, NULL, NULL); xbm_load, NULL, NULL);

View File

@ -294,7 +294,7 @@ xmc_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
xmc_load, NULL, NULL); xmc_load, NULL, NULL);

View File

@ -192,7 +192,7 @@ xpm_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
xpm_load, NULL, NULL); xpm_load, NULL, NULL);

View File

@ -320,7 +320,7 @@ xwd_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
xwd_load, NULL, NULL); xwd_load, NULL, NULL);

View File

@ -148,7 +148,7 @@ bmp_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
bmp_load, NULL, NULL); bmp_load, NULL, NULL);

View File

@ -142,7 +142,7 @@ dds_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
dds_load, NULL, NULL); dds_load, NULL, NULL);

View File

@ -102,7 +102,7 @@ exr_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
exr_load, NULL, NULL); exr_load, NULL, NULL);

View File

@ -129,7 +129,7 @@ faxg3_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
faxg3_load, NULL, NULL); faxg3_load, NULL, NULL);

View File

@ -172,7 +172,7 @@ fits_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
fits_load, NULL, NULL); fits_load, NULL, NULL);

View File

@ -177,7 +177,7 @@ fli_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
fli_load, NULL, NULL); fli_load, NULL, NULL);

View File

@ -127,7 +127,7 @@ icns_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
icns_load, NULL, NULL); icns_load, NULL, NULL);

View File

@ -168,7 +168,7 @@ ico_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
ico_load, NULL, NULL); ico_load, NULL, NULL);
@ -196,7 +196,7 @@ ico_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_CUR_PROC)) else if (! strcmp (name, LOAD_CUR_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
ico_load, NULL, NULL); ico_load, NULL, NULL);
@ -226,7 +226,7 @@ ico_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_ANI_PROC)) else if (! strcmp (name, LOAD_ANI_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
ani_load, NULL, NULL); ani_load, NULL, NULL);

View File

@ -129,7 +129,7 @@ jpeg_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
jpeg_load, NULL, NULL); jpeg_load, NULL, NULL);

View File

@ -129,7 +129,7 @@ psd_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
psd_load, NULL, NULL); psd_load, NULL, NULL);
@ -158,7 +158,7 @@ psd_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_MERGED_PROC)) else if (! strcmp (name, LOAD_MERGED_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
psd_load, NULL, NULL); psd_load, NULL, NULL);
@ -271,7 +271,7 @@ psd_create_procedure (GimpPlugIn *plug_in,
} }
else if (! strcmp (name, LOAD_METADATA_PROC)) else if (! strcmp (name, LOAD_METADATA_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
psd_load_metadata, NULL, NULL); psd_load_metadata, NULL, NULL);

View File

@ -268,7 +268,7 @@ darktable_create_procedure (GimpPlugIn *plug_in,
load_blurb = g_strdup_printf (format->load_blurb_format, "darktable"); load_blurb = g_strdup_printf (format->load_blurb_format, "darktable");
load_help = g_strdup_printf (format->load_help_format, "darktable"); load_help = g_strdup_printf (format->load_help_format, "darktable");
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
darktable_load, darktable_load,
(gpointer) format, NULL); (gpointer) format, NULL);

View File

@ -128,7 +128,7 @@ placeholder_create_procedure (GimpPlugIn *plug_in,
load_blurb = g_strdup_printf (format->load_blurb_format, "placeholder"); load_blurb = g_strdup_printf (format->load_blurb_format, "placeholder");
load_help = g_strdup_printf (format->load_help_format, "placeholder"); load_help = g_strdup_printf (format->load_help_format, "placeholder");
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
placeholder_load, placeholder_load,
(gpointer) format, NULL); (gpointer) format, NULL);

View File

@ -219,7 +219,7 @@ rawtherapee_create_procedure (GimpPlugIn *plug_in,
load_blurb = g_strdup_printf (format->load_blurb_format, "rawtherapee"); load_blurb = g_strdup_printf (format->load_blurb_format, "rawtherapee");
load_help = g_strdup_printf (format->load_help_format, "rawtherapee"); load_help = g_strdup_printf (format->load_help_format, "rawtherapee");
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
rawtherapee_load, rawtherapee_load,
(gpointer) format, NULL); (gpointer) format, NULL);

View File

@ -139,7 +139,7 @@ sgi_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
sgi_load, NULL, NULL); sgi_load, NULL, NULL);

View File

@ -155,7 +155,7 @@ tiff_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
tiff_load, NULL, NULL); tiff_load, NULL, NULL);

View File

@ -117,7 +117,7 @@ webp_create_procedure (GimpPlugIn *plug_in,
if (! strcmp (name, LOAD_PROC)) if (! strcmp (name, LOAD_PROC))
{ {
procedure = gimp_load_procedure_new2 (plug_in, name, procedure = gimp_load_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
webp_load, NULL, NULL); webp_load, NULL, NULL);