Merge branch '8.10' into revise-premultiply

jcupitt · web-flow · commit 1f18963cb4e3 · 2021-03-05T11:17:40.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,7 @@
 - fix a possible segv with very wide images [f1ac]
 - revise premultiply, again [jjonesrs]
 - revise profile handling in vipsthumbnail
+- 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/tiffsave.c b/libvips/foreign/tiffsave.c
@@ -590,8 +590,8 @@ vips_foreign_save_tiff_buffer_init( VipsForeignSaveTiffBuffer *buffer )
  * User @level to set the ZSTD compression level. Use @lossless to
  * set WEBP lossless mode on. Use @Q to set the WEBP compression level.
  *
- * Use @predictor to set the predictor for lzw and deflate compression. It
- * defaults to #VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL, meaning horizontal
+ * Use @predictor to set the predictor for lzw, deflate and zstd compression.
+ * It defaults to #VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL, meaning horizontal
  * differencing. Please refer to the libtiff 
  * specifications for further discussion of various predictors. 
  *
diff --git 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,9 @@ 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_ZSTD ||
+		wtiff->compression == COMPRESSION_LZW) &&
 		wtiff->predictor != VIPS_FOREIGN_TIFF_PREDICTOR_NONE ) 
 		TIFFSetField( tif, TIFFTAG_PREDICTOR, wtiff->predictor );
 
@@ -1866,6 +1867,12 @@ 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_ZSTD ||
+		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 ) 

Original file line number	Diff line number	Diff line change
`@@ -590,8 +590,8 @@ vips_foreign_save_tiff_buffer_init( VipsForeignSaveTiffBuffer *buffer )`
`590`	`590`	`* User @level to set the ZSTD compression level. Use @lossless to`
`591`	`591`	`* set WEBP lossless mode on. Use @Q to set the WEBP compression level.`
`592`	`592`	`*`
`593`		`- * Use @predictor to set the predictor for lzw and deflate compression. It`
`594`		`- * defaults to #VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL, meaning horizontal`
	`593`	`+ * Use @predictor to set the predictor for lzw, deflate and zstd compression.`
	`594`	`+ * It defaults to #VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL, meaning horizontal`
`595`	`595`	`* differencing. Please refer to the libtiff`
`596`	`596`	`* specifications for further discussion of various predictors.`
`597`	`597`	`*`