From: Dirk Lemstra Date: Sat, 15 Sep 2018 13:02:37 +0000 (+0200) Subject: Report libjpeg-turbo version. X-Git-Tag: 7.0.8-12~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bc8e03b4cf6b02543c6aaa3bb53f566e2822f21;p=imagemagick Report libjpeg-turbo version. --- diff --git a/coders/jpeg.c b/coders/jpeg.c index c407f01ae..589a865a7 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -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)