]> granicus.if.org Git - imagemagick/commitdiff
Report libjpeg-turbo version.
authorDirk Lemstra <dirk@git.imagemagick.org>
Sat, 15 Sep 2018 13:02:37 +0000 (15:02 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Sat, 15 Sep 2018 13:02:37 +0000 (15:02 +0200)
coders/jpeg.c

index c407f01ae1f9228b1f8e6cb7360e5e837e22a649..589a865a7487f4f593e3c5c9d5bf6694b39ecbf4 100644 (file)
@@ -1572,8 +1572,12 @@ ModuleExport size_t RegisterJPEGImage(void)
     *entry;
 
   *version='\0';
-#if defined(JPEG_LIB_VERSION)
-  (void) FormatLocaleString(version,MagickPathExtent,"%d",JPEG_LIB_VERSION);
+#if defined(LIBJPEG_TURBO_VERSION)
+  (void) CopyMagickString(version,"libjpeg-turbo " MagickStringify(
+    LIBJPEG_TURBO_VERSION),MagickPathExtent);
+#elif defined(JPEG_LIB_VERSION)
+  (void) FormatLocaleString(version,MagickPathExtent,"libjpeg %d",
+    JPEG_LIB_VERSION);
 #endif
   entry=AcquireMagickInfo("JPEG","JPE",JPEGDescription);
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)