AlderconeStudio/PIKApp
0
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Updated with upstream update

Browse Source
This commit is contained in:
Cassowary
2023-10-30 15:55:30 -07:00
parent 098531073c
commit 3bbdd873ef
584 changed files with 91827 additions and 70362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plug-ins/file-jpeg/jpeg-load.c
View File

@ -479,6 +479,7 @@ load_image (GFile *file,
{
FILE *fp;
GFile *temp_file = NULL;
PikaProcedure *procedure;
PikaValueArray *return_vals = NULL;
temp_file = pika_temp_file ("tmp");
@ -500,15 +501,15 @@ load_image (GFile *file,
g_free (photoshop_data);
return_vals =
pika_pdb_run_procedure (pika_get_pdb (),
"file-psd-load-metadata",
PIKA_TYPE_RUN_MODE, PIKA_RUN_NONINTERACTIVE,
G_TYPE_FILE, temp_file,
G_TYPE_INT, photoshop_len,
PIKA_TYPE_IMAGE, image,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_NONE);
procedure = pika_pdb_lookup_procedure (pika_get_pdb (),
"file-psd-load-metadata");
return_vals = pika_procedure_run (procedure,
"run-mode", PIKA_RUN_NONINTERACTIVE,
"file", temp_file,
"size", photoshop_len,
"image", image,
"metadata-type", FALSE,
NULL);
g_file_delete (temp_file, NULL, NULL);
g_object_unref (temp_file);

9
plug-ins/file-jpeg/jpeg-save.c
View File

@ -880,7 +880,8 @@ save_dialog (PikaProcedure *procedure,
/* File size label. */
preview_size = pika_procedure_dialog_get_label (PIKA_PROCEDURE_DIALOG (dialog),
"preview-size", _("File size: unknown"));
"preview-size", _("File size: unknown"),
FALSE, FALSE);
gtk_label_set_xalign (GTK_LABEL (preview_size), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (preview_size), PANGO_ELLIPSIZE_END);
pika_label_set_attributes (GTK_LABEL (preview_size),
@ -892,7 +893,8 @@ save_dialog (PikaProcedure *procedure,
/* Profile label. */
profile_label = pika_procedure_dialog_get_label (PIKA_PROCEDURE_DIALOG (dialog),
"profile-label", _("No soft-proofing profile"));
"profile-label", _("No soft-proofing profile"),
FALSE, FALSE);
gtk_label_set_xalign (GTK_LABEL (profile_label), 0.0);
gtk_label_set_ellipsize (GTK_LABEL (profile_label), PANGO_ELLIPSIZE_END);
pika_label_set_attributes (GTK_LABEL (profile_label),
@ -969,7 +971,8 @@ save_dialog (PikaProcedure *procedure,
"dct", PIKA_INT_STORE (store));
pika_procedure_dialog_get_label (PIKA_PROCEDURE_DIALOG (dialog),
"advanced-title", _("Advanced Options"));
"advanced-title", _("Advanced Options"),
FALSE, FALSE);
widget = pika_procedure_dialog_get_widget (PIKA_PROCEDURE_DIALOG (dialog),
"smoothing", PIKA_TYPE_SPIN_SCALE);
pika_help_set_help_data (widget, NULL, "file-jpeg-save-smoothing");

109
plug-ins/file-jpeg/jpeg.c
View File

@ -54,32 +54,35 @@ struct _JpegClass
#define JPEG_TYPE (jpeg_get_type ())
#define JPEG (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), JPEG_TYPE, Jpeg))
#define JPEG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), JPEG_TYPE, Jpeg))
GType jpeg_get_type (void) G_GNUC_CONST;
static GList * jpeg_query_procedures (PikaPlugIn *plug_in);
static PikaProcedure * jpeg_create_procedure (PikaPlugIn *plug_in,
const gchar *name);
static GList * jpeg_query_procedures (PikaPlugIn *plug_in);
static PikaProcedure * jpeg_create_procedure (PikaPlugIn *plug_in,
const gchar *name);
static PikaValueArray * jpeg_load (PikaProcedure *procedure,
PikaRunMode run_mode,
GFile *file,
const PikaValueArray *args,
gpointer run_data);
static PikaValueArray * jpeg_load_thumb (PikaProcedure *procedure,
GFile *file,
gint size,
const PikaValueArray *args,
gpointer run_data);
static PikaValueArray * jpeg_save (PikaProcedure *procedure,
PikaRunMode run_mode,
PikaImage *image,
gint n_drawables,
PikaDrawable **drawables,
GFile *file,
const PikaValueArray *args,
gpointer run_data);
static PikaValueArray * jpeg_load (PikaProcedure *procedure,
PikaRunMode run_mode,
GFile *file,
PikaMetadata *metadata,
PikaMetadataLoadFlags *flags,
PikaProcedureConfig *config,
gpointer run_data);
static PikaValueArray * jpeg_load_thumb (PikaProcedure *procedure,
GFile *file,
gint size,
PikaProcedureConfig *config,
gpointer run_data);
static PikaValueArray * jpeg_save (PikaProcedure *procedure,
PikaRunMode run_mode,
PikaImage *image,
gint n_drawables,
PikaDrawable **drawables,
GFile *file,
PikaMetadata *metadata,
PikaProcedureConfig *config,
gpointer run_data);
G_DEFINE_TYPE (Jpeg, jpeg, PIKA_TYPE_PLUG_IN)
@ -177,7 +180,7 @@ jpeg_create_procedure (PikaPlugIn *plug_in,
{
procedure = pika_save_procedure_new (plug_in, name,
PIKA_PDB_PROC_TYPE_PLUGIN,
jpeg_save, NULL, NULL);
TRUE, jpeg_save, NULL, NULL);
pika_procedure_set_image_types (procedure, "RGB*, GRAY*");
@ -318,11 +321,13 @@ jpeg_create_procedure (PikaPlugIn *plug_in,
}
static PikaValueArray *
jpeg_load (PikaProcedure *procedure,
PikaRunMode run_mode,
GFile *file,
const PikaValueArray *args,
gpointer run_data)
jpeg_load (PikaProcedure *procedure,
PikaRunMode run_mode,
GFile *file,
PikaMetadata *metadata,
PikaMetadataLoadFlags *flags,
PikaProcedureConfig *config,
gpointer run_data)
{
PikaValueArray *return_vals;
PikaImage *image;
@ -351,23 +356,8 @@ jpeg_load (PikaProcedure *procedure,
if (image)
{
PikaMetadata *metadata;
metadata = pika_image_metadata_load_prepare (image, "image/jpeg",
file, NULL);
if (metadata)
{
PikaMetadataLoadFlags flags = PIKA_METADATA_LOAD_ALL;
if (resolution_loaded)
flags &= ~PIKA_METADATA_LOAD_RESOLUTION;
pika_image_metadata_load_finish (image, "image/jpeg",
metadata, flags);
g_object_unref (metadata);
}
if (resolution_loaded)
*flags &= ~PIKA_METADATA_LOAD_RESOLUTION;
}
if (! image)
@ -385,11 +375,11 @@ jpeg_load (PikaProcedure *procedure,
}
static PikaValueArray *
jpeg_load_thumb (PikaProcedure *procedure,
GFile *file,
gint size,
const PikaValueArray *args,
gpointer run_data)
jpeg_load_thumb (PikaProcedure *procedure,
GFile *file,
gint size,
PikaProcedureConfig *config,
gpointer run_data)
{
PikaValueArray *return_vals;
PikaImage *image;
@ -432,15 +422,14 @@ jpeg_save (PikaProcedure *procedure,
gint n_drawables,
PikaDrawable **drawables,
GFile *file,
const PikaValueArray *args,
PikaMetadata *metadata,
PikaProcedureConfig *config,
gpointer run_data)
{
PikaPDBStatusType status = PIKA_PDB_SUCCESS;
PikaProcedureConfig *config;
PikaMetadata *metadata;
PikaImage *orig_image;
PikaExportReturn export = PIKA_EXPORT_CANCEL;
GError *error = NULL;
PikaPDBStatusType status = PIKA_PDB_SUCCESS;
PikaImage *orig_image;
PikaExportReturn export = PIKA_EXPORT_CANCEL;
GError *error = NULL;
gint orig_num_quant_tables = -1;
gint orig_quality = -1;
@ -448,9 +437,6 @@ jpeg_save (PikaProcedure *procedure,
gegl_init (NULL, NULL);
config = pika_procedure_create_config (procedure);
metadata = pika_procedure_config_begin_export (config, image, run_mode,
args, "image/jpeg");
preview_image = NULL;
preview_layer = NULL;
@ -614,9 +600,6 @@ jpeg_save (PikaProcedure *procedure,
pika_metadata_set_bits_per_sample (metadata, 8);
}
pika_procedure_config_end_export (config, image, file, status);
g_object_unref (config);
if (export == PIKA_EXPORT_EXPORT)
{
/* If the image was exported, delete the new display. This also