From: cristy Date: Fri, 3 Jan 2014 21:08:39 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2985 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcd740c576d69f08937fe55fb78d1c3358301d3a;p=imagemagick --- diff --git a/coders/jp2.c b/coders/jp2.c index 56740f857..137caabc0 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -547,11 +547,20 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) */ ModuleExport size_t RegisterJP2Image(void) { + char + version[MaxTextExtent]; + MagickInfo *entry; + *version='\0'; +#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) + (void) FormatLocaleString(version,MaxTextExtent,"%s",opj_version()); +#endif entry=SetMagickInfo("JP2"); entry->description=ConstantString("JPEG-2000 File Format Syntax"); + if (*version != '\0') + entry->version=ConstantString(version); entry->mime_type=ConstantString("image/jp2"); entry->module=ConstantString("JP2"); entry->magick=(IsImageFormatHandler *) IsJP2; @@ -565,6 +574,8 @@ ModuleExport size_t RegisterJP2Image(void) (void) RegisterMagickInfo(entry); entry=SetMagickInfo("J2K"); entry->description=ConstantString("JPEG-2000 Code Stream Syntax"); + if (*version != '\0') + entry->version=ConstantString(version); entry->mime_type=ConstantString("image/jp2"); entry->module=ConstantString("JP2"); entry->magick=(IsImageFormatHandler *) IsJ2K; @@ -578,6 +589,8 @@ ModuleExport size_t RegisterJP2Image(void) (void) RegisterMagickInfo(entry); entry=SetMagickInfo("JPT"); entry->description=ConstantString("JPEG-2000 File Format Syntax"); + if (*version != '\0') + entry->version=ConstantString(version); entry->mime_type=ConstantString("image/jp2"); entry->module=ConstantString("JP2"); entry->magick=(IsImageFormatHandler *) IsJP2; @@ -591,6 +604,8 @@ ModuleExport size_t RegisterJP2Image(void) (void) RegisterMagickInfo(entry); entry=SetMagickInfo("JPC"); entry->description=ConstantString("JPEG-2000 Code Stream Syntax"); + if (*version != '\0') + entry->version=ConstantString(version); entry->mime_type=ConstantString("image/jp2"); entry->module=ConstantString("JP2"); entry->magick=(IsImageFormatHandler *) IsJPC;