From 5ce2dc8c917812a029b2328ca34381f32952fcc6 Mon Sep 17 00:00:00 2001 From: cherry530 <707078654@qq.com> Date: Fri, 4 Aug 2023 15:49:43 +0800 Subject: [PATCH] Disable LOSSLESS_SUPPORTED checks for libjpeg turbo because they break with their latest code. Signed-off-by: cherry530 <707078654@qq.com> --- coders/jpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coders/jpeg.c b/coders/jpeg.c index e0ecb09..c7b30d9 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -954,7 +954,7 @@ EstimateJPEGQuality(const struct jpeg_decompress_struct *jpeg_info, i; save_quality=0; -#ifdef D_LOSSLESS_SUPPORTED +#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED) if (image->compression==LosslessJPEGCompression) { save_quality=100; @@ -1461,7 +1461,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, } #endif #if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED) -#ifdef D_LOSSLESS_SUPPORTED +#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED) image->interlace= jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace; image->compression=jpeg_info.process == JPROC_LOSSLESS ? -- 2.33.0