From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 27 Dec 2014 22:43:35 +0000 (+0000)
Subject: http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25495
X-Git-Tag: 7.0.1-0~1533
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e62a80ab5da7919381be7aaccfd8b6083262fc0;p=imagemagick

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

diff --git a/coders/jpeg.c b/coders/jpeg.c
index c2d6a6886..1ce2a3e0d 100644
--- 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)