callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: Use the standardized value for deflate compression in tiff-save.

Browse Source 
Ironically, the standardized value is called COMPRESSION_ADOBE_DEFLATE,
while the vendor-specific value is called COMPRESSION_DEFLATE.

(cherry picked from commit 4bc51691e52e5813bb10b3e6e4b1e18cdeab5b6d)
This commit is contained in:
Michael Henning
2013-09-20 19:05:18 -04:00
parent ebef7983e8
commit 91738c3b93
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plug-ins/common/file-tiff-save.c
View File

@ -303,13 +303,13 @@ run (const gchar *name,
{ {
switch (param[5].data.d_int32) switch (param[5].data.d_int32)
{ {
case 0: tsvals.compression = COMPRESSION_NONE; break; case 0: tsvals.compression = COMPRESSION_NONE; break;
case 1: tsvals.compression = COMPRESSION_LZW; break; case 1: tsvals.compression = COMPRESSION_LZW; break;
case 2: tsvals.compression = COMPRESSION_PACKBITS; break; case 2: tsvals.compression = COMPRESSION_PACKBITS; break;
case 3: tsvals.compression = COMPRESSION_DEFLATE; break; case 3: tsvals.compression = COMPRESSION_ADOBE_DEFLATE; break;
case 4: tsvals.compression = COMPRESSION_JPEG; break; case 4: tsvals.compression = COMPRESSION_JPEG; break;
case 5: tsvals.compression = COMPRESSION_CCITTFAX3; break; case 5: tsvals.compression = COMPRESSION_CCITTFAX3; break;
case 6: tsvals.compression = COMPRESSION_CCITTFAX4; break; case 6: tsvals.compression = COMPRESSION_CCITTFAX4; break;
default: status = GIMP_PDB_CALLING_ERROR; break; default: status = GIMP_PDB_CALLING_ERROR; break;
} }
@ -829,7 +829,7 @@ save_image (const gchar *filename,
TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
TIFFSetField (tif, TIFFTAG_COMPRESSION, compression); TIFFSetField (tif, TIFFTAG_COMPRESSION, compression);
if ((compression == COMPRESSION_LZW || compression == COMPRESSION_DEFLATE) if ((compression == COMPRESSION_LZW || compression == COMPRESSION_ADOBE_DEFLATE)
&& (predictor != 0)) && (predictor != 0))
{ {
TIFFSetField (tif, TIFFTAG_PREDICTOR, predictor); TIFFSetField (tif, TIFFTAG_PREDICTOR, predictor);
@ -1092,11 +1092,11 @@ save_dialog (gboolean has_alpha,
G_CALLBACK (gimp_radio_button_update), G_CALLBACK (gimp_radio_button_update),
&tsvals.compression, tsvals.compression, &tsvals.compression, tsvals.compression,
_("_None"), COMPRESSION_NONE, NULL, _("_None"), COMPRESSION_NONE, NULL,
_("_LZW"), COMPRESSION_LZW, NULL, _("_LZW"), COMPRESSION_LZW, NULL,
_("_Pack Bits"), COMPRESSION_PACKBITS, NULL, _("_Pack Bits"), COMPRESSION_PACKBITS, NULL,
_("_Deflate"), COMPRESSION_DEFLATE, NULL, _("_Deflate"), COMPRESSION_ADOBE_DEFLATE, NULL,
_("_JPEG"), COMPRESSION_JPEG, NULL, _("_JPEG"), COMPRESSION_JPEG, NULL,
_("CCITT Group _3 fax"), COMPRESSION_CCITTFAX3, &g3, _("CCITT Group _3 fax"), COMPRESSION_CCITTFAX3, &g3,
_("CCITT Group _4 fax"), COMPRESSION_CCITTFAX4, &g4, _("CCITT Group _4 fax"), COMPRESSION_CCITTFAX4, &g4,