From 66f39b6556eb1227f57fc3f931f8f0d6418199c9 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Wed, 3 Jan 2024 20:02:07 +0100
Subject: [PATCH] TIFF loader: Properly suppress messages from libtiff

---
 src/modules/loaders/loader_tiff.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/modules/loaders/loader_tiff.c b/src/modules/loaders/loader_tiff.c
index ad05e0e..ae71ded 100644
--- a/src/modules/loaders/loader_tiff.c
+++ b/src/modules/loaders/loader_tiff.c
@@ -10,6 +10,16 @@ static const char *const _formats[] = { "tiff", "tif" };
 
 #define DD(fmt...)  DC(DBG_PFX, 0x80, fmt)
 
+static void
+_tiff_error(const char *module, const char *fmt, va_list ap)
+{
+#if IMLIB2_DEBUG
+    char            buf[128];
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+    D("%s: %s: %s\n", __func__, module, buf);
+#endif
+}
+
 static struct {
     const unsigned char *data, *dptr;
     unsigned int    size;
@@ -364,6 +374,9 @@ _load(ImlibImage *im, int load_data)
 
     mm_init(im->fi->fdata, im->fi->fsize);
 
+    TIFFSetErrorHandler(_tiff_error);
+    TIFFSetWarningHandler(_tiff_error);
+
     tif = TIFFClientOpen(im->fi->name, "r", NULL, _tiff_read, _tiff_write,
                          _tiff_seek, _tiff_close, _tiff_size,
                          _tiff_map, _tiff_unmap);
@@ -470,6 +483,9 @@ _save(ImlibImage *im)
     int             i;
     ImlibImageTag  *tag;
 
+    TIFFSetErrorHandler(_tiff_error);
+    TIFFSetWarningHandler(_tiff_error);
+
     tif = TIFFFdOpen(fileno(im->fi->fp), im->fi->name, "w");
     if (!tif)
         return LOAD_FAIL;