From bae640a11600559f2dc54f8b7dbef50c3e49c6d5 Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch <p@janouch.name>
Date: Tue, 5 Dec 2023 03:30:18 +0100
Subject: Circumvent JPEG QS & libjpeg-turbo incompatibility

UV upsampling visibly requires JPEG QS to update its code
to follow recent changes within libjpeg-turbo.
---
 fiv-io.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fiv-io.c b/fiv-io.c
index ed93e62..d89be3a 100644
--- a/fiv-io.c
+++ b/fiv-io.c
@@ -1614,11 +1614,16 @@ load_libjpeg_enhanced(
 {
 	// Go for the maximum quality setting.
 	jpegqs_control_t opts = {
-		.flags = JPEGQS_DIAGONALS | JPEGQS_JOINT_YUV | JPEGQS_UPSAMPLE_UV,
+		.flags = JPEGQS_DIAGONALS | JPEGQS_JOINT_YUV,
 		.threads = g_get_num_processors(),
 		.niter = 3,
 	};
 
+	// Waiting for https://github.com/ilyakurdyukov/jpeg-quantsmooth/issues/28
+#if LIBJPEG_TURBO_VERSION_NUMBER < 2001090
+	opts.flags |= JPEGQS_UPSAMPLE_UV;
+#endif
+
 	(void) jpegqs_start_decompress(cinfo, &opts);
 	while (cinfo->output_scanline < cinfo->output_height)
 		(void) jpeg_read_scanlines(cinfo, lines + cinfo->output_scanline,
-- 
cgit v1.2.3-70-g09d2