Updated with upstream update
This commit is contained in:
@ -54,33 +54,35 @@ struct _DarktableClass
|
||||
|
||||
|
||||
#define DARKTABLE_TYPE (darktable_get_type ())
|
||||
#define DARKTABLE (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DARKTABLE_TYPE, Darktable))
|
||||
#define DARKTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DARKTABLE_TYPE, Darktable))
|
||||
|
||||
GType darktable_get_type (void) G_GNUC_CONST;
|
||||
|
||||
static GList * darktable_init_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * darktable_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
static GList * darktable_init_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * darktable_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
|
||||
static PikaValueArray * darktable_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * darktable_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * darktable_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * darktable_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
|
||||
static PikaImage * load_image (GFile *file,
|
||||
PikaRunMode run_mode,
|
||||
GError **error);
|
||||
static PikaImage * load_thumbnail_image (GFile *file,
|
||||
gint thumb_size,
|
||||
gint *width,
|
||||
gint *height,
|
||||
GError **error);
|
||||
static PikaImage * load_image (GFile *file,
|
||||
PikaRunMode run_mode,
|
||||
GError **error);
|
||||
static PikaImage * load_thumbnail_image (GFile *file,
|
||||
gint thumb_size,
|
||||
gint *width,
|
||||
gint *height,
|
||||
GError **error);
|
||||
|
||||
|
||||
G_DEFINE_TYPE (Darktable, darktable, PIKA_TYPE_PLUG_IN)
|
||||
@ -306,11 +308,13 @@ darktable_create_procedure (PikaPlugIn *plug_in,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
darktable_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
darktable_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaValueArray *return_vals;
|
||||
PikaImage *image;
|
||||
@ -333,11 +337,11 @@ darktable_load (PikaProcedure *procedure,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
darktable_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
darktable_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaValueArray *return_vals;
|
||||
gint width;
|
||||
@ -517,7 +521,7 @@ load_thumbnail_image (GFile *file,
|
||||
pika_progress_init_printf (_("Opening thumbnail for '%s'"),
|
||||
pika_file_get_utf8_name (file));
|
||||
|
||||
*width = *height = thumb_size;
|
||||
*width = *height = 0;
|
||||
|
||||
if (g_spawn_sync (NULL,
|
||||
argv,
|
||||
|
@ -48,19 +48,21 @@ struct _PlaceholderClass
|
||||
|
||||
|
||||
#define PLACEHOLDER_TYPE (placeholder_get_type ())
|
||||
#define PLACEHOLDER (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLACEHOLDER_TYPE, Placeholder))
|
||||
#define PLACEHOLDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLACEHOLDER_TYPE, Placeholder))
|
||||
|
||||
GType placeholder_get_type (void) G_GNUC_CONST;
|
||||
|
||||
static GList * placeholder_query_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * placeholder_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
static GList * placeholder_query_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * placeholder_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
|
||||
static PikaValueArray * placeholder_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * placeholder_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
|
||||
|
||||
G_DEFINE_TYPE (Placeholder, placeholder, PIKA_TYPE_PLUG_IN)
|
||||
@ -163,11 +165,13 @@ placeholder_create_procedure (PikaPlugIn *plug_in,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
placeholder_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
placeholder_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
const FileFormat *format = run_data;
|
||||
GError *error = NULL;
|
||||
|
@ -55,24 +55,26 @@ struct _RawtherapeeClass
|
||||
|
||||
|
||||
#define RAWTHERAPEE_TYPE (rawtherapee_get_type ())
|
||||
#define RAWTHERAPEE (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RAWTHERAPEE_TYPE, Rawtherapee))
|
||||
#define RAWTHERAPEE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RAWTHERAPEE_TYPE, Rawtherapee))
|
||||
|
||||
GType rawtherapee_get_type (void) G_GNUC_CONST;
|
||||
|
||||
static GList * rawtherapee_init_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * rawtherapee_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
static GList * rawtherapee_init_procedures (PikaPlugIn *plug_in);
|
||||
static PikaProcedure * rawtherapee_create_procedure (PikaPlugIn *plug_in,
|
||||
const gchar *name);
|
||||
|
||||
static PikaValueArray * rawtherapee_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * rawtherapee_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * rawtherapee_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
static PikaValueArray * rawtherapee_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data);
|
||||
|
||||
static PikaImage * load_image (GFile *file,
|
||||
PikaRunMode run_mode,
|
||||
@ -257,11 +259,13 @@ rawtherapee_create_procedure (PikaPlugIn *plug_in,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
rawtherapee_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
rawtherapee_load (PikaProcedure *procedure,
|
||||
PikaRunMode run_mode,
|
||||
GFile *file,
|
||||
PikaMetadata *metadata,
|
||||
PikaMetadataLoadFlags *flags,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaValueArray *return_vals;
|
||||
PikaImage *image;
|
||||
@ -284,11 +288,11 @@ rawtherapee_load (PikaProcedure *procedure,
|
||||
}
|
||||
|
||||
static PikaValueArray *
|
||||
rawtherapee_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
const PikaValueArray *args,
|
||||
gpointer run_data)
|
||||
rawtherapee_load_thumb (PikaProcedure *procedure,
|
||||
GFile *file,
|
||||
gint size,
|
||||
PikaProcedureConfig *config,
|
||||
gpointer run_data)
|
||||
{
|
||||
PikaValueArray *return_vals;
|
||||
PikaImage *image;
|
||||
|
Reference in New Issue
Block a user