[gimp] plug-ins: port file-tiff-save to GimpProcedureConfig
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: port file-tiff-save to GimpProcedureConfig
- Date: Mon, 8 Jun 2020 18:45:30 +0000 (UTC)
commit 9054ab5dc5dd2e9b91f444d2daff14a74dc0b0fb
Author: Michael Natterer <mitch gimp org>
Date: Mon May 18 00:13:21 2020 +0200
plug-ins: port file-tiff-save to GimpProcedureConfig
Implement the GUI using prop widgets and remove the glade file.
Change loading to attach the right parasite so the save procedure
finds the fake "last values".
plug-ins/file-tiff/Makefile.am | 1 +
plug-ins/file-tiff/file-tiff-load.c | 77 ++---
plug-ins/file-tiff/file-tiff-save.c | 578 ++++++++++++++++++------------------
plug-ins/file-tiff/file-tiff-save.h | 45 +--
plug-ins/file-tiff/file-tiff.c | 262 ++++++++--------
plug-ins/file-tiff/file-tiff.h | 25 ++
plug-ins/ui/Makefile.am | 1 -
plug-ins/ui/meson.build | 1 -
plug-ins/ui/plug-in-file-tiff.ui | 172 -----------
po-plug-ins/POTFILES.in | 1 -
10 files changed, 508 insertions(+), 655 deletions(-)
---
diff --git a/plug-ins/file-tiff/Makefile.am b/plug-ins/file-tiff/Makefile.am
index 8969040675..483b31d6a3 100644
--- a/plug-ins/file-tiff/Makefile.am
+++ b/plug-ins/file-tiff/Makefile.am
@@ -34,6 +34,7 @@ libexec_PROGRAMS = file-tiff
file_tiff_SOURCES = \
file-tiff.c \
+ file-tiff.h \
file-tiff-io.c \
file-tiff-io.h \
file-tiff-load.c \
diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c
index 8b7a22ac28..b88f6f7e7d 100644
--- a/plug-ins/file-tiff/file-tiff-load.c
+++ b/plug-ins/file-tiff/file-tiff-load.c
@@ -52,6 +52,7 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include "file-tiff.h"
#include "file-tiff-io.h"
#include "file-tiff-load.h"
@@ -61,13 +62,6 @@
#define PLUG_IN_ROLE "gimp-file-tiff-load"
-typedef struct
-{
- gint compression;
- gint fillorder;
- gboolean save_transp_pixels;
-} TiffSaveVals;
-
typedef struct
{
GimpDrawable *drawable;
@@ -124,13 +118,6 @@ static gboolean load_dialog (TIFF *tif,
DefaultExtra *default_extra);
-static TiffSaveVals tsvals =
-{
- COMPRESSION_NONE, /* compression */
- TRUE, /* alpha handling */
-};
-
-
/* returns a pointer into the TIFF */
static const gchar *
tiff_get_page_name (TIFF *tif)
@@ -157,13 +144,14 @@ load_image (GFile *file,
TIFF *tif;
TiffSelectedPages pages;
- GList *images_list = NULL;
- DefaultExtra default_extra = GIMP_TIFF_LOAD_UNASSALPHA;
- gint first_image_type = GIMP_RGB;
- gint min_row = G_MAXINT;
- gint min_col = G_MAXINT;
- gint max_row = 0;
- gint max_col = 0;
+ GList *images_list = NULL;
+ DefaultExtra default_extra = GIMP_TIFF_LOAD_UNASSALPHA;
+ gint first_image_type = GIMP_RGB;
+ gint min_row = G_MAXINT;
+ gint min_col = G_MAXINT;
+ gint max_row = 0;
+ gint max_col = 0;
+ gboolean save_transp_pixels = FALSE;
gint li;
*image = NULL;
@@ -328,7 +316,7 @@ load_image (GFile *file,
gboolean is_bw;
gint i;
gboolean worst_case = FALSE;
- TiffSaveVals save_vals;
+ gint gimp_compression = GIMP_COMPRESSION_NONE;
const gchar *name;
TIFFSetDirectory (tif, pages.pages[li]);
@@ -481,13 +469,13 @@ load_image (GFile *file,
if (extra > 0 && (extra_types[0] == EXTRASAMPLE_ASSOCALPHA))
{
alpha = TRUE;
- tsvals.save_transp_pixels = FALSE;
+ save_transp_pixels = FALSE;
extra--;
}
else if (extra > 0 && (extra_types[0] == EXTRASAMPLE_UNASSALPHA))
{
alpha = TRUE;
- tsvals.save_transp_pixels = TRUE;
+ save_transp_pixels = TRUE;
extra--;
}
else if (extra > 0 && (extra_types[0] == EXTRASAMPLE_UNSPECIFIED))
@@ -504,11 +492,11 @@ load_image (GFile *file,
{
case GIMP_TIFF_LOAD_ASSOCALPHA:
alpha = TRUE;
- tsvals.save_transp_pixels = FALSE;
+ save_transp_pixels = FALSE;
break;
case GIMP_TIFF_LOAD_UNASSALPHA:
alpha = TRUE;
- tsvals.save_transp_pixels = TRUE;
+ save_transp_pixels = TRUE;
break;
default: /* GIMP_TIFF_LOAD_CHANNEL */
alpha = FALSE;
@@ -531,11 +519,11 @@ load_image (GFile *file,
{
case GIMP_TIFF_LOAD_ASSOCALPHA:
alpha = TRUE;
- tsvals.save_transp_pixels = FALSE;
+ save_transp_pixels = FALSE;
break;
case GIMP_TIFF_LOAD_UNASSALPHA:
alpha = TRUE;
- tsvals.save_transp_pixels = TRUE;
+ save_transp_pixels = TRUE;
break;
default: /* GIMP_TIFF_LOAD_CHANNEL */
alpha = FALSE;
@@ -574,7 +562,7 @@ load_image (GFile *file,
if (alpha)
{
- if (tsvals.save_transp_pixels)
+ if (save_transp_pixels)
{
if (profile_linear)
{
@@ -639,7 +627,7 @@ load_image (GFile *file,
if (alpha)
{
- if (tsvals.save_transp_pixels)
+ if (save_transp_pixels)
{
if (profile_linear)
{
@@ -749,7 +737,7 @@ load_image (GFile *file,
}
}
- save_vals.compression = compression;
+ gimp_compression = tiff_compression_to_gimp_compression (compression);
}
if (worst_case)
@@ -841,14 +829,33 @@ load_image (GFile *file,
/* attach parasites */
{
- GimpParasite *parasite;
- const gchar *img_desc;
+ GString *string;
+ GimpConfigWriter *writer;
+ GimpParasite *parasite;
+ const gchar *img_desc;
+
+ /* construct the save parasite manually instead of simply
+ * creating and saving a save config object, because we want
+ * it to contain only some properties
+ */
+
+ string = g_string_new (NULL);
+ writer = gimp_config_writer_new_from_string (string);
+
+ gimp_config_writer_open (writer, "compression");
+ gimp_config_writer_printf (writer, "%d", gimp_compression);
+ gimp_config_writer_close (writer);
- parasite = gimp_parasite_new ("tiff-save-options", 0,
- sizeof (save_vals), &save_vals);
+ gimp_config_writer_finish (writer, NULL, NULL);
+
+ parasite = gimp_parasite_new ("GimpProcedureConfig-file-tiff-save-last",
+ GIMP_PARASITE_PERSISTENT,
+ string->len + 1, string->str);
gimp_image_attach_parasite (*image, parasite);
gimp_parasite_free (parasite);
+ g_string_free (string, TRUE);
+
/* Attach a parasite containing the image description.
* Pretend to be a gimp comment so other plugins will use this
* description as an image comment where appropriate.
diff --git a/plug-ins/file-tiff/file-tiff-save.c b/plug-ins/file-tiff/file-tiff-save.c
index f23904ee78..b6c7f37d84 100644
--- a/plug-ins/file-tiff/file-tiff-save.c
+++ b/plug-ins/file-tiff/file-tiff-save.c
@@ -53,6 +53,7 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include "file-tiff.h"
#include "file-tiff-io.h"
#include "file-tiff-save.h"
@@ -69,16 +70,12 @@ static gboolean save_paths (TIFF *tif,
gint offset_x,
gint offset_y);
-static void comment_entry_callback (GtkWidget *widget,
- gchar **comment);
-
static void byte2bit (const guchar *byteline,
gint width,
guchar *bitline,
gboolean invert);
-static void save_thumbnail (TiffSaveVals *tsvals,
- GimpImage *image,
+static void save_thumbnail (GimpImage *image,
TIFF *tif);
@@ -269,18 +266,18 @@ save_paths (TIFF *tif,
*/
static gboolean
-save_layer (TIFF *tif,
- TiffSaveVals *tsvals,
- const Babl *space,
- GimpImage *image,
- GimpLayer *layer,
- gint32 page,
- gint32 num_pages,
- GimpImage *orig_image, /* the export function might */
- /* have created a duplicate */
- gint *saved_bpp,
- gboolean out_linear,
- GError **error)
+save_layer (TIFF *tif,
+ GObject *config,
+ const Babl *space,
+ GimpImage *image,
+ GimpLayer *layer,
+ gint32 page,
+ gint32 num_pages,
+ GimpImage *orig_image, /* the export function might
+ * have created a duplicate */
+ gint *saved_bpp,
+ gboolean out_linear,
+ GError **error)
{
gboolean status = FALSE;
gushort red[256];
@@ -319,8 +316,15 @@ save_layer (TIFF *tif,
gdouble yresolution;
gushort save_unit = RESUNIT_INCH;
gint offset_x, offset_y;
+ gint config_compression;
+ gboolean config_save_transp_pixels;
+
+ g_object_get (config,
+ "compression", &config_compression,
+ "save-transparent-pixels", &config_save_transp_pixels,
+ NULL);
- compression = tsvals->compression;
+ compression = gimp_compression_to_tiff_compression (config_compression);
layer_name = gimp_item_get_name (GIMP_ITEM (layer));
@@ -456,7 +460,7 @@ save_layer (TIFF *tif,
samplesperpixel = 4;
photometric = PHOTOMETRIC_RGB;
alpha = TRUE;
- if (tsvals->save_transp_pixels)
+ if (config_save_transp_pixels)
{
if (out_linear)
{
@@ -508,7 +512,7 @@ save_layer (TIFF *tif,
samplesperpixel = 2;
photometric = PHOTOMETRIC_MINISBLACK;
alpha = TRUE;
- if (tsvals->save_transp_pixels)
+ if (config_save_transp_pixels)
{
if (out_linear)
{
@@ -649,7 +653,7 @@ save_layer (TIFF *tif,
if (alpha)
{
- if (tsvals->save_transp_pixels ||
+ if (config_save_transp_pixels ||
/* Associated alpha, hence premultiplied components is
* meaningless for palette images with transparency in TIFF
* format, since alpha is set per pixel, not per color (so a
@@ -780,9 +784,8 @@ out:
}
static void
-save_thumbnail (TiffSaveVals *tsvals,
- GimpImage *image,
- TIFF *tif)
+save_thumbnail (GimpImage *image,
+ TIFF *tif)
{
/* now switch IFD and write thumbnail
*
@@ -793,83 +796,81 @@ save_thumbnail (TiffSaveVals *tsvals,
* Exif saves the thumbnail as a second page. To avoid this, the
* thumbnail must be saved with the functions of libtiff.
*/
- if (tsvals->save_thumbnail)
- {
- GdkPixbuf *thumb_pixbuf;
- guchar *thumb_pixels;
- guchar *buf;
- gint image_width;
- gint image_height;
- gint thumbw;
- gint thumbh;
- gint x, y;
-#define EXIF_THUMBNAIL_SIZE 256
+ GdkPixbuf *thumb_pixbuf;
+ guchar *thumb_pixels;
+ guchar *buf;
+ gint image_width;
+ gint image_height;
+ gint thumbw;
+ gint thumbh;
+ gint x, y;
- image_width = gimp_image_width (image);
- image_height = gimp_image_height (image);
+#define EXIF_THUMBNAIL_SIZE 256
- if (image_width > image_height)
- {
- thumbw = EXIF_THUMBNAIL_SIZE;
- thumbh = EXIF_THUMBNAIL_SIZE * image_height / image_width;
- }
- else
- {
- thumbh = EXIF_THUMBNAIL_SIZE;
- thumbw = EXIF_THUMBNAIL_SIZE * image_width / image_height;
- }
+ image_width = gimp_image_width (image);
+ image_height = gimp_image_height (image);
- thumb_pixbuf = gimp_image_get_thumbnail (image, thumbw, thumbh,
- GIMP_PIXBUF_KEEP_ALPHA);
+ if (image_width > image_height)
+ {
+ thumbw = EXIF_THUMBNAIL_SIZE;
+ thumbh = EXIF_THUMBNAIL_SIZE * image_height / image_width;
+ }
+ else
+ {
+ thumbh = EXIF_THUMBNAIL_SIZE;
+ thumbw = EXIF_THUMBNAIL_SIZE * image_width / image_height;
+ }
- thumb_pixels = gdk_pixbuf_get_pixels (thumb_pixbuf);
+ thumb_pixbuf = gimp_image_get_thumbnail (image, thumbw, thumbh,
+ GIMP_PIXBUF_KEEP_ALPHA);
- TIFFSetField (tif, TIFFTAG_SUBFILETYPE, FILETYPE_REDUCEDIMAGE);
- TIFFSetField (tif, TIFFTAG_IMAGEWIDTH, thumbw);
- TIFFSetField (tif, TIFFTAG_IMAGELENGTH, thumbh);
- TIFFSetField (tif, TIFFTAG_BITSPERSAMPLE, 8);
- TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
- TIFFSetField (tif, TIFFTAG_ROWSPERSTRIP, thumbh);
- TIFFSetField (tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
- TIFFSetField (tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
- TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
- TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, 3);
+ thumb_pixels = gdk_pixbuf_get_pixels (thumb_pixbuf);
- buf = _TIFFmalloc (thumbw * 3);
+ TIFFSetField (tif, TIFFTAG_SUBFILETYPE, FILETYPE_REDUCEDIMAGE);
+ TIFFSetField (tif, TIFFTAG_IMAGEWIDTH, thumbw);
+ TIFFSetField (tif, TIFFTAG_IMAGELENGTH, thumbh);
+ TIFFSetField (tif, TIFFTAG_BITSPERSAMPLE, 8);
+ TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+ TIFFSetField (tif, TIFFTAG_ROWSPERSTRIP, thumbh);
+ TIFFSetField (tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+ TIFFSetField (tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
+ TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+ TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, 3);
- for (y = 0; y < thumbh; y++)
- {
- guchar *p = buf;
+ buf = _TIFFmalloc (thumbw * 3);
- for (x = 0; x < thumbw; x++)
- {
- *p++ = *thumb_pixels++; /* r */
- *p++ = *thumb_pixels++; /* g */
- *p++ = *thumb_pixels++; /* b */
- thumb_pixels++;
- }
+ for (y = 0; y < thumbh; y++)
+ {
+ guchar *p = buf;
- TIFFWriteScanline (tif, buf, y, 0);
+ for (x = 0; x < thumbw; x++)
+ {
+ *p++ = *thumb_pixels++; /* r */
+ *p++ = *thumb_pixels++; /* g */
+ *p++ = *thumb_pixels++; /* b */
+ thumb_pixels++;
}
- _TIFFfree (buf);
+ TIFFWriteScanline (tif, buf, y, 0);
+ }
- TIFFWriteDirectory (tif);
+ _TIFFfree (buf);
- g_object_unref (thumb_pixbuf);
- }
+ TIFFWriteDirectory (tif);
+
+ g_object_unref (thumb_pixbuf);
}
static void
-save_metadata (GFile *file,
- TiffSaveVals *tsvals,
- GimpImage *image,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags metadata_flags,
- gint saved_bpp)
+save_metadata (GFile *file,
+ GObject *config,
+ GimpImage *image,
+ GimpMetadata *metadata,
+ gint saved_bpp)
{
- gchar **exif_tags;
+ gchar **exif_tags;
+ gboolean save_thumbnail;
/* See bug 758909: clear TIFFTAG_MIN/MAXSAMPLEVALUE because
* exiv2 saves them with wrong type and the original values
@@ -877,7 +878,8 @@ save_metadata (GFile *file,
* we also clear some other tags that were only meaningful
* for the original imported image.
*/
- static const gchar *exif_tags_to_remove[] = {
+ static const gchar *exif_tags_to_remove[] =
+ {
"Exif.Image.0x0118",
"Exif.Image.0x0119",
"Exif.Image.0x011d",
@@ -894,7 +896,7 @@ save_metadata (GFile *file,
"Exif.Image.StripByteCounts",
"Exif.Image.StripOffsets"
};
- static const guint n_keys = G_N_ELEMENTS(exif_tags_to_remove);
+ static const guint n_keys = G_N_ELEMENTS (exif_tags_to_remove);
for (int k = 0; k < n_keys; k++)
{
@@ -903,7 +905,7 @@ save_metadata (GFile *file,
}
/* get rid of all the EXIF tags for anything but the first sub image. */
- exif_tags = gexiv2_metadata_get_exif_tags (GEXIV2_METADATA(metadata));
+ exif_tags = gexiv2_metadata_get_exif_tags (GEXIV2_METADATA (metadata));
for (char **tag = exif_tags; *tag; tag++)
{
if (g_str_has_prefix (*tag, "Exif.Image")
@@ -914,50 +916,34 @@ save_metadata (GFile *file,
gimp_metadata_set_bits_per_sample (metadata, saved_bpp);
- if (tsvals->save_exif)
- metadata_flags |= GIMP_METADATA_SAVE_EXIF;
- else
- metadata_flags &= ~GIMP_METADATA_SAVE_EXIF;
-
- if (tsvals->save_xmp)
- metadata_flags |= GIMP_METADATA_SAVE_XMP;
- else
- metadata_flags &= ~GIMP_METADATA_SAVE_XMP;
-
- if (tsvals->save_iptc)
- metadata_flags |= GIMP_METADATA_SAVE_IPTC;
- else
- metadata_flags &= ~GIMP_METADATA_SAVE_IPTC;
+ g_object_get (config,
+ "save-thumbnail", &save_thumbnail,
+ NULL);
/* never save metadata thumbnails for TIFF, see bug #729952 */
- metadata_flags &= ~GIMP_METADATA_SAVE_THUMBNAIL;
+ g_object_set (config,
+ "save-thumbnail", FALSE,
+ NULL);
- if (tsvals->save_profile)
- metadata_flags |= GIMP_METADATA_SAVE_COLOR_PROFILE;
- else
- metadata_flags &= ~GIMP_METADATA_SAVE_COLOR_PROFILE;
+ gimp_procedure_config_save_metadata (GIMP_PROCEDURE_CONFIG (config),
+ image, file);
- gimp_image_metadata_save_finish (image,
- "image/tiff",
- metadata, metadata_flags,
- file, NULL);
+ g_object_set (config,
+ "save-thumbnail", save_thumbnail,
+ NULL);
}
gboolean
-save_image (GFile *file,
- TiffSaveVals *tsvals,
- GimpImage *image,
- GimpImage *orig_image, /* the export function */
- /* might have created */
- /* a duplicate */
- const gchar *image_comment,
- gint *saved_bpp,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags metadata_flags,
- GError **error)
+save_image (GFile *file,
+ GimpImage *image,
+ GimpImage *orig_image, /* the export function might
+ * have created a duplicate */
+ GObject *config,
+ GimpMetadata *metadata,
+ GError **error)
{
- const Babl *space = NULL;
TIFF *tif;
+ const Babl *space = NULL;
gboolean status = FALSE;
gboolean out_linear = FALSE;
gint number_of_sub_IFDs = 1;
@@ -965,6 +951,16 @@ save_image (GFile *file,
gint32 num_layers;
gint32 current_layer = 0;
GList *layers;
+ gint saved_bpp;
+ gchar *config_comment;
+ gboolean config_save_profile;
+ gboolean config_save_thumbnail;
+
+ g_object_get (config,
+ "comment", &config_comment,
+ "save-color-profile", &config_save_profile,
+ "save-thumbnail", &config_save_thumbnail,
+ NULL);
layers = gimp_image_list_layers (image);
layers = g_list_reverse (layers);
@@ -987,42 +983,31 @@ save_image (GFile *file,
TIFFSetField (tif, TIFFTAG_DOCUMENTNAME, g_file_get_path (file));
- /* The TIFF spec explicitly says ASCII for the image description. */
- if (image_comment)
+ if (config_comment && *config_comment)
{
- const gchar *c = image_comment;
+ const gchar *c = config_comment;
gint len;
+ /* The TIFF spec explicitly says ASCII for the image description. */
for (len = strlen (c); len; c++, len--)
{
if ((guchar) *c > 127)
{
g_message (_("The TIFF format only supports comments in\n"
"7bit ASCII encoding. No comment is saved."));
- image_comment = NULL;
+ g_free (config_comment);
+ config_comment = NULL;
break;
}
}
- }
- /* do we have a comment? If so, create a new parasite to hold it,
- * and attach it to the image. The attach function automatically
- * detaches a previous incarnation of the parasite. */
- if (image_comment && *image_comment)
- {
- GimpParasite *parasite;
-
- TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, image_comment);
- parasite = gimp_parasite_new ("gimp-comment",
- GIMP_PARASITE_PERSISTENT,
- strlen (image_comment) + 1, image_comment);
- gimp_image_attach_parasite (orig_image, parasite);
- gimp_parasite_free (parasite);
+ if (config_comment)
+ TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, config_comment);
}
#ifdef TIFFTAG_ICCPROFILE
- if (tsvals->save_profile)
+ if (config_save_profile)
{
GimpColorProfile *profile;
const guint8 *icc_data;
@@ -1058,22 +1043,22 @@ save_image (GFile *file,
#endif
/* we put the whole file's thumbnail into the first IFD (i.e., page) */
- if (tsvals->save_thumbnail)
+ if (config_save_thumbnail)
TIFFSetField (tif, TIFFTAG_SUBIFD, number_of_sub_IFDs, sub_IFDs_offsets);
/* write last layer as first page. */
- if (! save_layer (tif, tsvals, space, image,
+ if (! save_layer (tif, config, space, image,
g_list_nth_data (layers, current_layer),
current_layer, num_layers,
- orig_image, saved_bpp, out_linear, error))
+ orig_image, &saved_bpp, out_linear, error))
{
goto out;
}
current_layer++;
/* write thumbnail */
- if (tsvals->save_thumbnail)
- save_thumbnail (tsvals, image, tif);
+ if (config_save_thumbnail)
+ save_thumbnail (image, tif);
/* close file so we can safely let exiv2 work on it to write metadata.
* this can be simplified once multi page TIFF is supported by exiv2
@@ -1082,7 +1067,7 @@ save_image (GFile *file,
TIFFClose (tif);
tif = NULL;
if (metadata)
- save_metadata (file, tsvals, image, metadata, metadata_flags, *saved_bpp);
+ save_metadata (file, config, image, metadata, saved_bpp);
/* write the remaining layers */
if (num_layers > 1)
@@ -1104,7 +1089,7 @@ save_image (GFile *file,
{
gint tmp_saved_bpp;
- if (! save_layer (tif, tsvals, space, image,
+ if (! save_layer (tif, config, space, image,
g_list_nth_data (layers, current_layer),
current_layer, num_layers, orig_image,
&tmp_saved_bpp, out_linear, error))
@@ -1112,7 +1097,7 @@ save_image (GFile *file,
goto out;
}
- if (tmp_saved_bpp != *saved_bpp)
+ if (tmp_saved_bpp != saved_bpp)
{
/* this should never happen. if it does, decide if it's
* really an error.
@@ -1143,179 +1128,204 @@ out:
return status;
}
-gboolean
-save_dialog (TiffSaveVals *tsvals,
- const gchar *help_id,
- gboolean has_alpha,
- gboolean is_monochrome,
- gboolean is_indexed,
- gboolean is_multi_layer,
- gchar **image_comment)
+static gboolean
+combo_sensitivity_func (gint value,
+ gpointer data)
{
- GError *error = NULL;
- GtkWidget *dialog;
- GtkWidget *vbox;
- GtkWidget *frame;
- GtkWidget *entry;
- GtkWidget *toggle;
- GtkWidget *cmp_g3;
- GtkWidget *cmp_g4;
- GtkWidget *cmp_jpeg;
- GtkBuilder *builder;
- gchar *ui_file;
- gboolean run;
-
- dialog = gimp_export_dialog_new (_("TIFF"), PLUG_IN_ROLE, help_id);
-
- builder = gtk_builder_new ();
- ui_file = g_build_filename (gimp_data_directory (),
- "ui", "plug-ins", "plug-in-file-tiff.ui",
- NULL);
- if (! gtk_builder_add_from_file (builder, ui_file, &error))
- {
- gchar *display_name = g_filename_display_name (ui_file);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- g_printerr (_("Error loading UI file '%s': %s"),
- display_name, error ? error->message : _("Unknown error"));
-
- g_free (display_name);
- }
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (data));
- g_free (ui_file);
+ if (gimp_int_store_lookup_by_value (model, value, &iter))
+ {
+ gpointer insensitive;
- vbox = GTK_WIDGET (gtk_builder_get_object (builder, "tiff_export_vbox"));
+ gtk_tree_model_get (model, &iter,
+ GIMP_INT_STORE_USER_DATA, &insensitive,
+ -1);
- gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
- vbox, FALSE, FALSE, 0);
- gtk_widget_show (vbox);
+ return ! GPOINTER_TO_INT (insensitive);
+ }
- vbox = GTK_WIDGET (gtk_builder_get_object (builder, "radio_button_box"));
+ return TRUE;
+}
- frame = gimp_int_radio_group_new (TRUE, _("Compression"),
- G_CALLBACK (gimp_radio_button_update),
- &tsvals->compression, NULL, tsvals->compression,
+static void
+combo_set_item_sensitive (GtkWidget *widget,
+ gint value,
+ gboolean sensitive)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- _("_None"), COMPRESSION_NONE, NULL,
- _("_LZW"), COMPRESSION_LZW, NULL,
- _("_Pack Bits"), COMPRESSION_PACKBITS, NULL,
- _("_Deflate"), COMPRESSION_ADOBE_DEFLATE, NULL,
- _("_JPEG"), COMPRESSION_JPEG, &cmp_jpeg,
- _("CCITT Group _3 fax"), COMPRESSION_CCITTFAX3, &cmp_g3,
- _("CCITT Group _4 fax"), COMPRESSION_CCITTFAX4, &cmp_g4,
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
- NULL);
+ if (gimp_int_store_lookup_by_value (model, value, &iter))
+ {
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ GIMP_INT_STORE_USER_DATA,
+ ! GINT_TO_POINTER (sensitive),
+ -1);
+ }
+}
- gtk_widget_set_sensitive (cmp_g3, is_monochrome);
- gtk_widget_set_sensitive (cmp_g4, is_monochrome);
- gtk_widget_set_sensitive (cmp_jpeg, ! is_indexed);
+gboolean
+save_dialog (GimpImage *image,
+ GimpProcedure *procedure,
+ GObject *config,
+ gboolean has_alpha,
+ gboolean is_monochrome,
+ gboolean is_indexed,
+ gboolean is_multi_layer)
+{
+ GtkWidget *dialog;
+ GtkWidget *main_vbox;
+ GtkWidget *grid;
+ GtkListStore *store;
+ GtkWidget *combo;
+ GtkWidget *button;
+ GtkWidget *frame;
+ GtkWidget *entry;
+ GimpCompression compression;
+ gint row = 0;
+ gboolean run;
+
+ dialog = gimp_procedure_dialog_new (procedure,
+ GIMP_PROCEDURE_CONFIG (config),
+ _("Export Image as TIFF"));
+
+ main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+ main_vbox, TRUE, TRUE, 0);
+ gtk_widget_show (main_vbox);
+
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
+
+ store =
+ gimp_int_store_new (_("None"), GIMP_COMPRESSION_NONE,
+ _("LZW"), GIMP_COMPRESSION_LZW,
+ _("Pack Bits"), GIMP_COMPRESSION_PACKBITS,
+ _("Deflate"), GIMP_COMPRESSION_ADOBE_DEFLATE,
+ _("JPEG"), GIMP_COMPRESSION_JPEG,
+ _("CCITT Group 3 fax"), GIMP_COMPRESSION_CCITTFAX3,
+ _("CCITT Group 4 fax"), GIMP_COMPRESSION_CCITTFAX4,
+ NULL);
+
+ combo = gimp_prop_int_combo_box_new (config, "compression",
+ GIMP_INT_STORE (store));
+ g_object_unref (store);
+
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("_Compression:"), 0.0, 0.5,
+ combo, 1);
+
+ gimp_int_combo_box_set_sensitivity (GIMP_INT_COMBO_BOX (combo),
+ combo_sensitivity_func,
+ combo, NULL);
+
+ combo_set_item_sensitive (combo, GIMP_COMPRESSION_CCITTFAX3, is_monochrome);
+ combo_set_item_sensitive (combo, GIMP_COMPRESSION_CCITTFAX4, is_monochrome);
+ combo_set_item_sensitive (combo, GIMP_COMPRESSION_JPEG, ! is_indexed);
+
+ g_object_get (config,
+ "compression", &compression,
+ NULL);
if (! is_monochrome)
{
- if (tsvals->compression == COMPRESSION_CCITTFAX3 ||
- tsvals->compression == COMPRESSION_CCITTFAX4)
+ if (compression == GIMP_COMPRESSION_CCITTFAX3 ||
+ compression == GIMP_COMPRESSION_CCITTFAX4)
{
- gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (cmp_g3),
- COMPRESSION_NONE);
+ compression = GIMP_COMPRESSION_NONE;
}
}
- if (is_indexed && tsvals->compression == COMPRESSION_JPEG)
+ if (is_indexed && compression == GIMP_COMPRESSION_JPEG)
{
- gimp_int_radio_group_set_active (GTK_RADIO_BUTTON (cmp_jpeg),
- COMPRESSION_NONE);
+ compression = GIMP_COMPRESSION_NONE;
}
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
- gtk_widget_show (frame);
+ g_object_set (config,
+ "compression", compression,
+ NULL);
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-alpha"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- has_alpha && (tsvals->save_transp_pixels || is_indexed));
- gtk_widget_set_sensitive (toggle, has_alpha && ! is_indexed);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_transp_pixels);
-
- entry = GTK_WIDGET (gtk_builder_get_object (builder, "commentfield"));
- gtk_entry_set_text (GTK_ENTRY (entry), *image_comment ? *image_comment : "");
-
- g_signal_connect (entry, "changed",
- G_CALLBACK (comment_entry_callback),
- image_comment);
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-exif"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_exif);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_exif);
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-xmp"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_xmp);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_xmp);
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-iptc"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_iptc);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_iptc);
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-thumbnail"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_thumbnail);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_thumbnail);
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-color-profile"));
-#ifdef TIFFTAG_ICCPROFILE
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_profile);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_profile);
-#else
- gtk_widget_hide (toggle);
-#endif
-
- toggle = GTK_WIDGET (gtk_builder_get_object (builder, "save-layers"));
if (is_multi_layer)
+ {
+ button = gimp_prop_check_button_new (config, "save-layers",
+ _("Save layers"));
+ }
+ else
{
/* If single-layer TIFF, set the toggle insensitive and show it as
* unchecked though I don't actually change the tsvals value to
* keep storing previously chosen value.
*/
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
- tsvals->save_layers);
- g_signal_connect (toggle, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &tsvals->save_layers);
+ button = gtk_check_button_new_with_mnemonic (_("Save layers"));
+ gtk_widget_set_sensitive (button, FALSE);
+ gtk_widget_show (button);
}
- gtk_widget_set_sensitive (toggle, is_multi_layer);
+
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+ if (has_alpha && ! is_indexed)
+ {
+ button = gimp_prop_check_button_new (config, "save-transparent-pixels",
+ _("Save color values from transparent pisels"));
+ }
+ else
+ {
+ button = gtk_check_button_new_with_mnemonic (_("Save color values from transparent pixels"));
+ gtk_widget_set_sensitive (button, FALSE);
+ gtk_widget_show (button);
+ }
+
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+ button = gimp_prop_check_button_new (config, "save-exif",
+ _("Save Exif data"));
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+ button = gimp_prop_check_button_new (config, "save-xmp",
+ _("Save XMP data"));
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+ button = gimp_prop_check_button_new (config, "save-iptc",
+ _("Save IPTC data"));
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+ button = gimp_prop_check_button_new (config, "save-thumbnail",
+ _("Save thumbnail"));
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+
+#ifdef TIFFTAG_ICCPROFILE
+ button = gimp_prop_check_button_new (config, "save-color-profile",
+ _("Save color profile"));
+ gtk_grid_attach (GTK_GRID (grid), button, 0, row++, 2, 1);
+#endif
+
+ frame = gimp_frame_new (_("Comment"));
+ gtk_grid_attach (GTK_GRID (grid), frame, 0, row++, 2, 1);
+ gtk_widget_show (frame);
+
+ entry = gimp_prop_entry_new (config, "comment", -1);
+ gtk_container_add (GTK_CONTAINER (frame), entry);
+ gtk_widget_show (entry);
gtk_widget_show (dialog);
- run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
+ run = gimp_procedure_dialog_run (GIMP_PROCEDURE_DIALOG (dialog));
gtk_widget_destroy (dialog);
return run;
}
-static void
-comment_entry_callback (GtkWidget *widget,
- gchar **comment)
-{
- const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget));
-
- g_free (*comment);
- *comment = g_strdup (text);
-}
-
/* Convert n bytes of 0/1 to a line of bits */
static void
byte2bit (const guchar *byteline,
diff --git a/plug-ins/file-tiff/file-tiff-save.h b/plug-ins/file-tiff/file-tiff-save.h
index 129263153b..db50ce49cf 100644
--- a/plug-ins/file-tiff/file-tiff-save.h
+++ b/plug-ins/file-tiff/file-tiff-save.h
@@ -23,37 +23,20 @@
#define __FILE_TIFF_SAVE_H__
-typedef struct
-{
- gint compression;
- gint fillorder;
- gboolean save_transp_pixels;
- gboolean save_exif;
- gboolean save_xmp;
- gboolean save_iptc;
- gboolean save_thumbnail;
- gboolean save_profile;
- gboolean save_layers;
-} TiffSaveVals;
-
-
-gboolean save_image (GFile *file,
- TiffSaveVals *tsvals,
- GimpImage *image,
- GimpImage *orig_image,
- const gchar *image_comment,
- gint *saved_bpp,
- GimpMetadata *metadata,
- GimpMetadataSaveFlags metadata_flags,
- GError **error);
-
-gboolean save_dialog (TiffSaveVals *tsvals,
- const gchar *help_id,
- gboolean has_alpha,
- gboolean is_monochrome,
- gboolean is_indexed,
- gboolean is_multi_layer,
- gchar **image_comment);
+gboolean save_image (GFile *file,
+ GimpImage *image,
+ GimpImage *orig_image,
+ GObject *config,
+ GimpMetadata *metadata,
+ GError **error);
+
+gboolean save_dialog (GimpImage *image,
+ GimpProcedure *procedure,
+ GObject *config,
+ gboolean has_alpha,
+ gboolean is_monochrome,
+ gboolean is_indexed,
+ gboolean is_multi_layer);
#endif /* __FILE_TIFF_SAVE_H__ */
diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c
index d04316f1e6..c85b998fe1 100644
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@ -49,6 +49,7 @@
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
+#include "file-tiff.h"
#include "file-tiff-load.h"
#include "file-tiff-save.h"
@@ -106,22 +107,6 @@ G_DEFINE_TYPE (Tiff, tiff, GIMP_TYPE_PLUG_IN)
GIMP_MAIN (TIFF_TYPE)
-static TiffSaveVals tsvals =
-{
- COMPRESSION_NONE, /* compression */
- TRUE, /* alpha handling */
- FALSE, /* save transp. pixels */
- FALSE, /* save exif */
- FALSE, /* save xmp */
- FALSE, /* save iptc */
- TRUE, /* save thumbnail */
- TRUE, /* save profile */
- TRUE /* save layer */
-};
-
-static gchar *image_comment = NULL;
-
-
static void
tiff_class_init (TiffClass *klass)
{
@@ -216,12 +201,54 @@ tiff_create_procedure (GimpPlugIn *plug_in,
0, 6, 0,
G_PARAM_READWRITE);
- GIMP_PROC_ARG_BOOLEAN (procedure, "save-transp-pixels",
- "Save transp pixels",
+ GIMP_PROC_ARG_BOOLEAN (procedure, "save-transparent-pixels",
+ "Save transparent pixels",
"Keep the color data masked by an alpha channel "
"intact (do not store premultiplied components)",
TRUE,
G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_STRING (procedure, "comment",
+ "Comment",
+ "Image comment",
+ gimp_get_default_comment (),
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-layers",
+ "Save Layers",
+ "Save Layers",
+ TRUE,
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-exif",
+ "Save Exif",
+ "Save Exif",
+ gimp_export_exif (),
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-xmp",
+ "Save XMP",
+ "Save XMP",
+ gimp_export_xmp (),
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-iptc",
+ "Save IPTC",
+ "Save IPTC",
+ gimp_export_iptc (),
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-thumbnail",
+ "Save thumbnail",
+ "Save thumbnail",
+ TRUE,
+ G_PARAM_READWRITE);
+
+ GIMP_PROC_AUX_ARG_BOOLEAN (procedure, "save-color-profile",
+ "Save profile",
+ "Save color profile",
+ gimp_export_color_profile (),
+ G_PARAM_READWRITE);
}
return procedure;
@@ -296,17 +323,22 @@ tiff_save (GimpProcedure *procedure,
const GimpValueArray *args,
gpointer run_data)
{
- GimpPDBStatusType status = GIMP_PDB_SUCCESS;
- GimpMetadata *metadata;
- GimpMetadataSaveFlags metadata_flags;
- GimpParasite *parasite;
- GimpImage *orig_image = image;
- GimpExportReturn export = GIMP_EXPORT_CANCEL;
- GError *error = NULL;
+ GimpProcedureConfig *config;
+ GimpPDBStatusType status = GIMP_PDB_SUCCESS;
+ GimpExportReturn export = GIMP_EXPORT_CANCEL;
+ GimpMetadata *metadata;
+ GimpImage *orig_image;
+ GError *error = NULL;
INIT_I18N ();
gegl_init (NULL, NULL);
+ config = gimp_procedure_create_config (procedure);
+ metadata = gimp_procedure_config_begin_export (config, image, run_mode,
+ args, "image/tiff");
+
+ orig_image = image;
+
switch (run_mode)
{
case GIMP_RUN_INTERACTIVE:
@@ -317,90 +349,17 @@ tiff_save (GimpProcedure *procedure,
break;
}
- /* Override the defaults with preferences. */
- metadata = gimp_image_metadata_save_prepare (orig_image,
- "image/tiff",
- &metadata_flags);
- tsvals.save_exif = (metadata_flags & GIMP_METADATA_SAVE_EXIF) != 0;
- tsvals.save_xmp = (metadata_flags & GIMP_METADATA_SAVE_XMP) != 0;
- tsvals.save_iptc = (metadata_flags & GIMP_METADATA_SAVE_IPTC) != 0;
- tsvals.save_thumbnail = (metadata_flags & GIMP_METADATA_SAVE_THUMBNAIL) != 0;
- tsvals.save_profile = (metadata_flags & GIMP_METADATA_SAVE_COLOR_PROFILE) != 0;
-
- parasite = gimp_image_get_parasite (orig_image, "gimp-comment");
- if (parasite)
- {
- image_comment = g_strndup (gimp_parasite_data (parasite),
- gimp_parasite_data_size (parasite));
- gimp_parasite_free (parasite);
- }
-
- switch (run_mode)
+ if (run_mode == GIMP_RUN_INTERACTIVE)
{
- case GIMP_RUN_INTERACTIVE:
- /* Possibly retrieve data */
- gimp_get_data (SAVE_PROC, &tsvals);
-
- parasite = gimp_image_get_parasite (orig_image, "tiff-save-options");
- if (parasite)
- {
- const TiffSaveVals *pvals = gimp_parasite_data (parasite);
-
- if (pvals->compression == COMPRESSION_DEFLATE)
- tsvals.compression = COMPRESSION_ADOBE_DEFLATE;
- else
- tsvals.compression = pvals->compression;
-
- tsvals.save_transp_pixels = pvals->save_transp_pixels;
- }
- gimp_parasite_free (parasite);
-
- /* First acquire information with a dialog */
- if (! save_dialog (&tsvals,
- SAVE_PROC,
+ if (! save_dialog (orig_image, procedure, G_OBJECT (config),
n_drawables == 1 ? gimp_drawable_has_alpha (drawables[0]) : TRUE,
image_is_monochrome (image),
gimp_image_base_type (image) == GIMP_INDEXED,
- image_is_multi_layer (image),
- &image_comment))
+ image_is_multi_layer (image)))
{
return gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL,
NULL);
}
- break;
-
- case GIMP_RUN_NONINTERACTIVE:
- switch (GIMP_VALUES_GET_INT (args, 0))
- {
- case 0: tsvals.compression = COMPRESSION_NONE; break;
- case 1: tsvals.compression = COMPRESSION_LZW; break;
- case 2: tsvals.compression = COMPRESSION_PACKBITS; break;
- case 3: tsvals.compression = COMPRESSION_ADOBE_DEFLATE; break;
- case 4: tsvals.compression = COMPRESSION_JPEG; break;
- case 5: tsvals.compression = COMPRESSION_CCITTFAX3; break;
- case 6: tsvals.compression = COMPRESSION_CCITTFAX4; break;
- }
-
- tsvals.save_transp_pixels = GIMP_VALUES_GET_BOOLEAN (args, 1);
- break;
-
- case GIMP_RUN_WITH_LAST_VALS:
- /* Possibly retrieve data */
- gimp_get_data (SAVE_PROC, &tsvals);
-
- parasite = gimp_image_get_parasite (orig_image, "tiff-save-options");
- if (parasite)
- {
- const TiffSaveVals *pvals = gimp_parasite_data (parasite);
-
- tsvals.compression = pvals->compression;
- tsvals.save_transp_pixels = pvals->save_transp_pixels;
- }
- gimp_parasite_free (parasite);
- break;
-
- default:
- break;
}
switch (run_mode)
@@ -409,68 +368,75 @@ tiff_save (GimpProcedure *procedure,
case GIMP_RUN_WITH_LAST_VALS:
{
GimpExportCapabilities capabilities;
-
- if (tsvals.compression == COMPRESSION_CCITTFAX3 ||
- tsvals.compression == COMPRESSION_CCITTFAX4)
- /* G3/G4 are fax compressions. They only support monochrome
- * images without alpha support.
- */
- capabilities = GIMP_EXPORT_CAN_HANDLE_INDEXED;
+ GimpCompression compression;
+ gboolean save_layers;
+
+ g_object_get (config,
+ "compression", &compression,
+ "save-layers", &save_layers,
+ NULL);
+
+ if (compression == GIMP_COMPRESSION_CCITTFAX3 ||
+ compression == GIMP_COMPRESSION_CCITTFAX4)
+ {
+ /* G3/G4 are fax compressions. They only support
+ * monochrome images without alpha support.
+ */
+ capabilities = GIMP_EXPORT_CAN_HANDLE_INDEXED;
+ }
else
- capabilities = GIMP_EXPORT_CAN_HANDLE_RGB |
- GIMP_EXPORT_CAN_HANDLE_GRAY |
- GIMP_EXPORT_CAN_HANDLE_INDEXED |
- GIMP_EXPORT_CAN_HANDLE_ALPHA;
-
- if (tsvals.save_layers && image_is_multi_layer (image))
+ {
+ capabilities = (GIMP_EXPORT_CAN_HANDLE_RGB |
+ GIMP_EXPORT_CAN_HANDLE_GRAY |
+ GIMP_EXPORT_CAN_HANDLE_INDEXED |
+ GIMP_EXPORT_CAN_HANDLE_ALPHA);
+ }
+
+ if (save_layers && image_is_multi_layer (image))
capabilities |= GIMP_EXPORT_CAN_HANDLE_LAYERS;
- export = gimp_export_image (&image, &n_drawables, &drawables, "TIFF", capabilities);
+ export = gimp_export_image (&image, &n_drawables, &drawables, "TIFF",
+ capabilities);
if (export == GIMP_EXPORT_CANCEL)
return gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL,
NULL);
}
break;
+
default:
break;
}
+#if 0
+ /* FIXME */
if (n_drawables != 1 && tsvals.save_layers)
{
g_set_error (&error, G_FILE_ERROR, 0,
_("\"Save layers\" option not set while trying to export multiple layers."));
- return gimp_procedure_new_return_values (procedure,
- GIMP_PDB_CALLING_ERROR,
- error);
+ status = GIMP_PDB_CALLING_ERROR;
}
+#endif
if (status == GIMP_PDB_SUCCESS)
{
- gint saved_bpp;
-
- if (save_image (file, &tsvals, image, orig_image, image_comment,
- &saved_bpp, metadata, metadata_flags, &error))
- {
- /* Store mvals data */
- gimp_set_data (SAVE_PROC, &tsvals, sizeof (TiffSaveVals));
- }
- else
+ if (! save_image (file, image, orig_image, G_OBJECT (config), metadata,
+ &error))
{
status = GIMP_PDB_EXECUTION_ERROR;
}
}
+ gimp_procedure_config_end_export (config, image, file, status);
+ g_object_unref (config);
+
if (export == GIMP_EXPORT_EXPORT)
{
gimp_image_delete (image);
g_free (drawables);
}
- if (metadata)
- g_object_unref (metadata);
-
return gimp_procedure_new_return_values (procedure, status, error);
}
@@ -514,3 +480,39 @@ image_is_multi_layer (GimpImage *image)
return (n_layers > 1);
}
+
+gint
+gimp_compression_to_tiff_compression (GimpCompression compression)
+{
+ switch (compression)
+ {
+ case GIMP_COMPRESSION_NONE: return COMPRESSION_NONE;
+ case GIMP_COMPRESSION_LZW: return COMPRESSION_LZW;
+ case GIMP_COMPRESSION_PACKBITS: return COMPRESSION_PACKBITS;
+ case GIMP_COMPRESSION_ADOBE_DEFLATE: return COMPRESSION_ADOBE_DEFLATE;
+ case GIMP_COMPRESSION_JPEG: return COMPRESSION_JPEG;
+ case GIMP_COMPRESSION_CCITTFAX3: return COMPRESSION_CCITTFAX3;
+ case GIMP_COMPRESSION_CCITTFAX4: return COMPRESSION_CCITTFAX4;
+ }
+
+ return COMPRESSION_NONE;
+}
+
+GimpCompression
+tiff_compression_to_gimp_compression (gint compression)
+{
+ switch (compression)
+ {
+ case COMPRESSION_NONE: return GIMP_COMPRESSION_NONE;
+ case COMPRESSION_LZW: return GIMP_COMPRESSION_LZW;
+ case COMPRESSION_PACKBITS: return GIMP_COMPRESSION_PACKBITS;
+ case COMPRESSION_DEFLATE: return GIMP_COMPRESSION_ADOBE_DEFLATE;
+ case COMPRESSION_ADOBE_DEFLATE: return GIMP_COMPRESSION_ADOBE_DEFLATE;
+ case COMPRESSION_OJPEG: return GIMP_COMPRESSION_JPEG;
+ case COMPRESSION_JPEG: return GIMP_COMPRESSION_JPEG;
+ case COMPRESSION_CCITTFAX3: return GIMP_COMPRESSION_CCITTFAX3;
+ case COMPRESSION_CCITTFAX4: return GIMP_COMPRESSION_CCITTFAX4;
+ }
+
+ return GIMP_COMPRESSION_NONE;
+}
diff --git a/plug-ins/file-tiff/file-tiff.h b/plug-ins/file-tiff/file-tiff.h
new file mode 100644
index 0000000000..126ed964bd
--- /dev/null
+++ b/plug-ins/file-tiff/file-tiff.h
@@ -0,0 +1,25 @@
+/* tiff for GIMP
+ * -Peter Mattis
+ */
+
+#ifndef __FILE_TIFF_H__
+#define __FILE_TIFF_H__
+
+
+typedef enum
+{
+ GIMP_COMPRESSION_NONE,
+ GIMP_COMPRESSION_LZW,
+ GIMP_COMPRESSION_PACKBITS,
+ GIMP_COMPRESSION_ADOBE_DEFLATE,
+ GIMP_COMPRESSION_JPEG,
+ GIMP_COMPRESSION_CCITTFAX3,
+ GIMP_COMPRESSION_CCITTFAX4
+} GimpCompression;
+
+
+gint gimp_compression_to_tiff_compression (GimpCompression compression);
+GimpCompression tiff_compression_to_gimp_compression (gint compression);
+
+
+#endif /* __FILE_TIFF_H__ */
diff --git a/plug-ins/ui/Makefile.am b/plug-ins/ui/Makefile.am
index bbdc0478c9..a4e144188d 100644
--- a/plug-ins/ui/Makefile.am
+++ b/plug-ins/ui/Makefile.am
@@ -1,7 +1,6 @@
uidatadir = $(gimpdatadir)/ui/plug-ins
uidata_DATA = \
- plug-in-file-tiff.ui \
plug-in-metadata-editor.ui \
plug-in-metadata-editor-calendar.ui \
plug-in-metadata-viewer.ui
diff --git a/plug-ins/ui/meson.build b/plug-ins/ui/meson.build
index a04fe959b4..5a4cd1290e 100644
--- a/plug-ins/ui/meson.build
+++ b/plug-ins/ui/meson.build
@@ -1,5 +1,4 @@
plugin_ui = [
- 'plug-in-file-tiff.ui',
'plug-in-metadata-editor-calendar.ui',
'plug-in-metadata-editor.ui',
'plug-in-metadata-viewer.ui',
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index 23f85ddb1c..dc53845dd2 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -144,7 +144,6 @@ plug-ins/gimpressionist/utils.c
plug-ins/goat-exercises/goat-exercise-c.c
plug-ins/goat-exercises/goat-exercise-py3.py
plug-ins/goat-exercises/goat-exercise-vala.vala
-[type: gettext/glade]plug-ins/ui/plug-in-file-tiff.ui
[type: gettext/glade]plug-ins/ui/plug-in-metadata-editor.ui
[type: gettext/glade]plug-ins/ui/plug-in-metadata-viewer.ui
plug-ins/gradient-flare/gradient-flare.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
