http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25495

diff --git a/coders/jpeg.c b/coders/jpeg.c
index c2d6a6886e42eb7da7c4580a921d7414868007b9..1ce2a3e0d0adc8ffe14cb7d6d17e2fd129b4af8f 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1518,7 +1518,7 @@ ModuleExport size_t RegisterJPEGImage(void)
   (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
 #endif
   entry=SetMagickInfo("JPE");
-#if JPEG_LIB_VERSION < 80
+#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)
@@ -1534,7 +1534,7 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("JPEG");
-#if JPEG_LIB_VERSION < 80
+#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)
@@ -1550,7 +1550,7 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("JPG");
-#if JPEG_LIB_VERSION < 80
+#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)
@@ -1565,7 +1565,7 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PJPEG");
-#if JPEG_LIB_VERSION < 80
+#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)