From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 12 Sep 2014 10:27:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2267fa460248a88dac4d9501ac79ab7f288387a9;p=imagemagick

---

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index e4a514ff7..f0f06206a 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -148,6 +148,8 @@ static const CoderMapInfo
     { "JBG", "JBIG" },
     { "JNG", "PNG" },
     { "JPC", "JP2" },
+    { "JPT", "JP2" },
+    { "JPM", "JP2" },
     { "J2C", "JP2" },
     { "J2K", "JP2" },
     { "JPG", "JPEG" },
diff --git a/coders/jp2.c b/coders/jp2.c
index 22a7d0929..d920f023f 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -572,6 +572,21 @@ ModuleExport size_t RegisterJP2Image(void)
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
+#endif
+  (void) RegisterMagickInfo(entry);
+  entry=SetMagickInfo("JPM");
+  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;
+  entry->adjoin=MagickFalse;
+  entry->seekable_stream=MagickTrue;
+  entry->thread_support=NoThreadSupport;
+#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
+  entry->decoder=(DecodeImageHandler *) ReadJP2Image;
+  entry->encoder=(EncodeImageHandler *) WriteJP2Image;
 #endif
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("JPT");
@@ -630,6 +645,7 @@ ModuleExport void UnregisterJP2Image(void)
 {
   (void) UnregisterMagickInfo("JPC");
   (void) UnregisterMagickInfo("JPT");
+  (void) UnregisterMagickInfo("JPM");
   (void) UnregisterMagickInfo("JP2");
   (void) UnregisterMagickInfo("J2K");
 }