old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

TIFF loader: Change default save compression type 

As of libtiff 4.4.0 saving an image with COMPRESSION_DEFLATE will
produce a warning:

 TIFFWriteDirectorySec: Warning, Creating TIFF with legacy Deflate codec identifier,
 COMPRESSION_ADOBE_DEFLATE is more widely supported.

So let's just use COMPRESSION_ADOBE_DEFLATE.
This commit is contained in:
Kim Woelders 2022-06-30 09:01:26 +02:00
parent 52511a15cc
commit f756d91c31
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/loaders/loader_tiff.c
View File

@ -466,12 +466,9 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity)
int x, y; int x, y;
uint8_t r, g, b, a = 0; uint8_t r, g, b, a = 0;
int has_alpha = IM_FLAG_ISSET(im, F_HAS_ALPHA); int has_alpha = IM_FLAG_ISSET(im, F_HAS_ALPHA);
int compression_type;
int i; int i;
/* By default uses patent-free use COMPRESSION_DEFLATE,
* another lossless compression technique */
ImlibImageTag *tag; ImlibImageTag *tag;
int compression_type = COMPRESSION_DEFLATE;
tif = TIFFOpen(im->real_file, "w"); tif = TIFFOpen(im->real_file, "w");
if (!tif) if (!tif)
@ -494,12 +491,14 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity)
/* saver modules */ /* saver modules */
/* compression */ /* compression */
compression_type = COMPRESSION_ADOBE_DEFLATE;
tag = __imlib_GetTag(im, "compression_type"); tag = __imlib_GetTag(im, "compression_type");
if (tag) if (tag)
{ {
compression_type = tag->val; switch (tag->val)
switch (compression_type)
{ {
default:
break;
case COMPRESSION_NONE: case COMPRESSION_NONE:
case COMPRESSION_CCITTRLE: case COMPRESSION_CCITTRLE:
case COMPRESSION_CCITTFAX3: case COMPRESSION_CCITTFAX3:
@ -523,11 +522,9 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity)
case COMPRESSION_JBIG: case COMPRESSION_JBIG:
case COMPRESSION_SGILOG: case COMPRESSION_SGILOG:
case COMPRESSION_SGILOG24: case COMPRESSION_SGILOG24:
compression_type = tag->val;
break; break;
default:
compression_type = COMPRESSION_DEFLATE;
} }
} }
TIFFSetField(tif, TIFFTAG_COMPRESSION, compression_type); TIFFSetField(tif, TIFFTAG_COMPRESSION, compression_type);