tif_jpeg.c: with mozjpeg, disable emission of Huffman tables in JpegTables tag, and use optimize_coding

1 files changed, 11 insertions, 0 deletions

diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index a3bf448c..ca386dc4 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1784,6 +1784,17 @@ JPEGSetupEncode(TIFF* tif)
 
     /* mozjpeg by default enables progressive JPEG, which is illegal in JPEG-in-TIFF */
     /* So explicitly disable it. */
+    if( sp->cinfo.c.num_scans != 0 &&
+        (sp->jpegtablesmode & JPEGTABLESMODE_HUFF) != 0 )
+    {
+        /* it has been found that mozjpeg could create corrupt strips/tiles */
+        /* in non optimize_coding mode. */
+        TIFFWarningExt(tif->tif_clientdata, module,
+                       "mozjpeg library likely detected. Disable emission of "
+                       "Huffman tables in JpegTables tag, and use optimize_coding "
+                       "to avoid potential issues");
+        sp->jpegtablesmode &= ~JPEGTABLESMODE_HUFF;
+    }
     sp->cinfo.c.num_scans = 0;
     sp->cinfo.c.scan_info = NULL;