From 86a6fd9d18440ba5955c6bf474fd3550933ba060 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 4 Mar 2021 09:39:50 +0000
Subject: [PATCH] fix tiff deflate predictor setting
the enums were mixed up, thanks Adios
see https://github.com/libvips/libvips/issues/2128
---
ChangeLog | 1 +
libvips/foreign/vips2tiff.c | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b6981a0..24bcfd63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
- fix includes of glib headers in C++ [lovell]
- fix build with more modern librsvg [lovell]
- fix a possible segv with very wide images [f1ac]
+- fix tiff deflate predictor setting [Adios]
18/12/20 started 8.10.5
- fix potential /0 in animated webp load [lovell]
diff --git a/libvips/foreign/vips2tiff.c b/libvips/foreign/vips2tiff.c
index 1ea73895..29f3f130 100644
--- a/libvips/foreign/vips2tiff.c
+++ b/libvips/foreign/vips2tiff.c
@@ -333,9 +333,9 @@ struct _Wtiff {
VipsPel *tbuf; /* TIFF output buffer */
int tls; /* Tile line size */
- int compression; /* Compression type */
+ int compression; /* libtiff compression type */
int Q; /* JPEG q-factor, webp level */
- int predictor; /* Predictor value */
+ int predictor; /* libtiff predictor type */
int tile; /* Tile or not */
int tilew, tileh; /* Tile size */
int pyramid; /* Wtiff pyramid */
@@ -663,8 +663,8 @@ wtiff_write_header( Wtiff *wtiff, Layer *layer )
TIFFSetField( tif, TIFFTAG_ZSTD_LEVEL, wtiff->level );
#endif /*HAVE_TIFF_COMPRESSION_WEBP*/
- if( (wtiff->compression == VIPS_FOREIGN_TIFF_COMPRESSION_DEFLATE ||
- wtiff->compression == VIPS_FOREIGN_TIFF_COMPRESSION_LZW) &&
+ if( (wtiff->compression == COMPRESSION_ADOBE_DEFLATE ||
+ wtiff->compression == COMPRESSION_LZW) &&
wtiff->predictor != VIPS_FOREIGN_TIFF_PREDICTOR_NONE )
TIFFSetField( tif, TIFFTAG_PREDICTOR, wtiff->predictor );
@@ -1866,6 +1866,11 @@ wtiff_copy_tiff( Wtiff *wtiff, TIFF *out, TIFF *in )
TIFFSetField( out, TIFFTAG_ZSTD_LEVEL, wtiff->level );
#endif /*HAVE_TIFF_COMPRESSION_WEBP*/
+ if( (wtiff->compression == COMPRESSION_ADOBE_DEFLATE ||
+ wtiff->compression == COMPRESSION_LZW) &&
+ wtiff->predictor != VIPS_FOREIGN_TIFF_PREDICTOR_NONE )
+ TIFFSetField( out, TIFFTAG_PREDICTOR, wtiff->predictor );
+
/* We can't copy profiles or xmp :( Set again from wtiff.
*/
if( !wtiff->strip )