Updated with upstream update
This commit is contained in:
@ -86,51 +86,54 @@ struct _FliClass
|
||||
|
||||
|
||||
#define FLI_TYPE (fli_get_type ())
|
||||
#define FLI (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLI_TYPE, Fli))
|
||||
#define FLI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLI_TYPE, Fli))
|
||||
|
||||
GType fli_get_type (void) G_GNUC_CONST;
|
||||
|
||||
static GList * fli_query_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * fli_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
static GList * fli_query_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * fli_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
|
||||
static PikaValueArray * fli_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * fli_save (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
PikaImage *image,
|
||||
gint n_drawables,
|
||||
PikaDrawable **drawables,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * fli_info (PikaProcedure *procedure,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * fli_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * fli_save (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
PikaImage *image,
|
||||
gint n_drawables,
|
||||
PikaDrawable **drawables,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * fli_info (PikaProcedure *procedure,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
|
||||
static PikaImage * load_image (GFile *file,
|
||||
GObject *config,
|
||||
GError **error);
|
||||
static gboolean load_dialog (GFile *file,
|
||||
PikaProcedure *procedure,
|
||||
GObject *config);
|
||||
static PikaImage * load_image (GFile *file,
|
||||
GObject *config,
|
||||
GError **error);
|
||||
static gboolean load_dialog (GFile *file,
|
||||
PikaProcedure *procedure,
|
||||
GObject *config);
|
||||
|
||||
static gboolean save_image (GFile *file,
|
||||
PikaImage *image,
|
||||
GObject *config,
|
||||
GError **error);
|
||||
static gboolean save_dialog (PikaImage *image,
|
||||
PikaProcedure *procedure,
|
||||
GObject *config);
|
||||
static gboolean save_image (GFile *file,
|
||||
PikaImage *image,
|
||||
GObject *config,
|
||||
GError **error);
|
||||
static gboolean save_dialog (PikaImage *image,
|
||||
PikaProcedure *procedure,
|
||||
GObject *config);
|
||||
|
||||
static gboolean get_info (GFile *file,
|
||||
gint32 *width,
|
||||
gint32 *height,
|
||||
gint32 *frames,
|
||||
GError **error);
|
||||
static gboolean get_info (GFile *file,
|
||||
gint32 *width,
|
||||
gint32 *height,
|
||||
gint32 *frames,
|
||||
GError **error);
|
||||
|
||||
|
||||
G_DEFINE_TYPE (Fli, fli, PIKA_TYPE_PLUG_IN)
|
||||
@ -211,7 +214,7 @@ fli_create_procedure (PikaPlugIn *plug_in,
|
||||
{
|
||||
procedure = pika_save_procedure_new (plug_in, name,
|
||||
PIKA_PDB_PROC_TYPE_PLUGIN,
|
||||
fli_save, NULL, NULL);
|
||||
FALSE, fli_save, NULL, NULL);
|
||||
|
||||
pika_procedure_set_image_types (procedure, "INDEXED, GRAY");
|
||||
|
||||
@ -290,22 +293,20 @@ fli_create_procedure (PikaPlugIn *plug_in,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
fli_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
fli_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaProcedureConfig *config;
|
||||
PikaValueArray *return_vals;
|
||||
PikaImage *image;
|
||||
GError *error = NULL;
|
||||
PikaValueArray *return_vals;
|
||||
PikaImage *image;
|
||||
GError *error = NULL;
|
||||
|
||||
gegl_init (NULL, NULL);
|
||||
|
||||
config = pika_procedure_create_config (procedure);
|
||||
pika_procedure_config_begin_run (config, NULL, run_mode, args);
|
||||
|
||||
if (run_mode == PIKA_RUN_INTERACTIVE)
|
||||
{
|
||||
if (! load_dialog (file, procedure, G_OBJECT (config)))
|
||||
@ -314,17 +315,13 @@ fli_load (PikaProcedure *procedure,
|
||||
NULL);
|
||||
}
|
||||
|
||||
image = load_image (file, G_OBJECT (config),
|
||||
&error);
|
||||
image = load_image (file, G_OBJECT (config), &error);
|
||||
|
||||
if (! image)
|
||||
return pika_procedure_new_return_values (procedure,
|
||||
PIKA_PDB_EXECUTION_ERROR,
|
||||
error);
|
||||
|
||||
pika_procedure_config_end_run (config, PIKA_PDB_SUCCESS);
|
||||
g_object_unref (config);
|
||||
|
||||
return_vals = pika_procedure_new_return_values (procedure,
|
||||
PIKA_PDB_SUCCESS,
|
||||
NULL);
|
||||
@ -341,19 +338,16 @@ fli_save (PikaProcedure *procedure,
|
||||
gint n_drawables,
|
||||
PikaDrawable **drawables,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
PikaMetadata *metadata,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaProcedureConfig *config;
|
||||
PikaPDBStatusType status = PIKA_PDB_SUCCESS;
|
||||
PikaExportReturn export = PIKA_EXPORT_CANCEL;
|
||||
GError *error = NULL;
|
||||
PikaPDBStatusType status = PIKA_PDB_SUCCESS;
|
||||
PikaExportReturn export = PIKA_EXPORT_CANCEL;
|
||||
GError *error = NULL;
|
||||
|
||||
gegl_init (NULL, NULL);
|
||||
|
||||
config = pika_procedure_create_config (procedure);
|
||||
pika_procedure_config_begin_run (config, image, run_mode, args);
|
||||
|
||||
switch (run_mode)
|
||||
{
|
||||
case PIKA_RUN_INTERACTIVE:
|
||||
@ -391,9 +385,6 @@ fli_save (PikaProcedure *procedure,
|
||||
}
|
||||
}
|
||||
|
||||
pika_procedure_config_end_run (config, status);
|
||||
g_object_unref (config);
|
||||
|
||||
if (export == PIKA_EXPORT_EXPORT)
|
||||
{
|
||||
pika_image_delete (image);
|
||||
@ -405,7 +396,7 @@ fli_save (PikaProcedure *procedure,
|
||||
|
||||
static PikaValueArray *
|
||||
fli_info (PikaProcedure *procedure,
|
||||
const PikaValueArray *args,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaValueArray *return_vals;
|
||||
@ -415,7 +406,7 @@ fli_info (PikaProcedure *procedure,
|
||||
gint32 frames;
|
||||
GError *error = NULL;
|
||||
|
||||
file = PIKA_VALUES_GET_FILE (args, 0);
|
||||
g_object_get (config, "file", &file, NULL);
|
||||
|
||||
if (! get_info (file, &width, &height, &frames,
|
||||
&error))
|
||||
|
Reference in New Issue
Block a user