[gimp/gimp-2-8] file-tiff-load: Fix loading of TIFFs containing old-style JPEG images (#688761)
- From: Mukund Sivaraman <muks src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] file-tiff-load: Fix loading of TIFFs containing old-style JPEG images (#688761)
- Date: Tue, 4 Dec 2012 08:10:31 +0000 (UTC)
commit 0d35348718e787a21864e67719826a90587cd39a
Author: Mukund Sivaraman <muks banu com>
Date: Tue Dec 4 13:37:57 2012 +0530
file-tiff-load: Fix loading of TIFFs containing old-style JPEG images (#688761)
This commit also moves the updated section of code, so that based on
worst_case, the image type and layer type are updated.
plug-ins/common/file-tiff-load.c | 55 ++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 25 deletions(-)
---
diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c
index ec651c1..375c130 100644
--- a/plug-ins/common/file-tiff-load.c
+++ b/plug-ins/common/file-tiff-load.c
@@ -748,6 +748,36 @@ load_image (const gchar *filename,
break;
}
+ /* attach a parasite containing the compression */
+ if (!TIFFGetField (tif, TIFFTAG_COMPRESSION, &tmp))
+ {
+ save_vals.compression = COMPRESSION_NONE;
+ }
+ else
+ {
+ switch (tmp)
+ {
+ case COMPRESSION_NONE:
+ case COMPRESSION_LZW:
+ case COMPRESSION_PACKBITS:
+ case COMPRESSION_DEFLATE:
+ case COMPRESSION_JPEG:
+ case COMPRESSION_CCITTFAX3:
+ case COMPRESSION_CCITTFAX4:
+ save_vals.compression = tmp;
+ break;
+
+ case COMPRESSION_OJPEG:
+ worst_case = TRUE;
+ save_vals.compression = COMPRESSION_JPEG;
+ break;
+
+ default:
+ save_vals.compression = COMPRESSION_NONE;
+ break;
+ }
+ }
+
if (worst_case)
{
image_type = GIMP_RGB;
@@ -814,31 +844,6 @@ load_image (const gchar *filename,
}
#endif
- /* attach a parasite containing the compression */
- if (!TIFFGetField (tif, TIFFTAG_COMPRESSION, &tmp))
- {
- save_vals.compression = COMPRESSION_NONE;
- }
- else
- {
- switch (tmp)
- {
- case COMPRESSION_NONE:
- case COMPRESSION_LZW:
- case COMPRESSION_PACKBITS:
- case COMPRESSION_DEFLATE:
- case COMPRESSION_JPEG:
- case COMPRESSION_CCITTFAX3:
- case COMPRESSION_CCITTFAX4:
- save_vals.compression = tmp;
- break;
-
- default:
- save_vals.compression = COMPRESSION_NONE;
- break;
- }
- }
-
parasite = gimp_parasite_new ("tiff-save-options", 0,
sizeof (save_vals), &save_vals);
gimp_image_attach_parasite (image, parasite);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]