From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 27 Nov 2014 14:06:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1710
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b338b71d21724d9b25b58cd12e07af5389a70ec9;p=imagemagick

---

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 1aeaa37eb..d5f6ac7b4 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -153,6 +153,7 @@ static const CoderMapInfo
     { "JPM", "JP2" },
     { "J2C", "JP2" },
     { "J2K", "JP2" },
+    { "JPE", "JPEG" },
     { "JPG", "JPEG" },
     { "JPX", "JP2" },
     { "K", "RAW" },
diff --git a/coders/jpeg.c b/coders/jpeg.c
index c6b28f0d4..8c700a8d6 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1514,6 +1514,22 @@ ModuleExport size_t RegisterJPEGImage(void)
 #if defined(JPEG_LIB_VERSION)
   (void) FormatLocaleString(version,MaxTextExtent,"%d",JPEG_LIB_VERSION);
 #endif
+  entry=SetMagickInfo("JPE");
+#if JPEG_LIB_VERSION < 80
+  entry->thread_support=NoThreadSupport;
+#endif
+#if defined(MAGICKCORE_JPEG_DELEGATE)
+  entry->decoder=(DecodeImageHandler *) ReadJPEGImage;
+  entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
+#endif
+  entry->magick=(IsImageFormatHandler *) IsJPEG;
+  entry->adjoin=MagickFalse;
+  entry->description=ConstantString(description);
+  if (*version != '\0')
+    entry->version=ConstantString(version);
+  entry->mime_type=ConstantString("image/jpeg");
+  entry->module=ConstantString("JPEG");
+  (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("JPEG");
 #if JPEG_LIB_VERSION < 80
   entry->thread_support=NoThreadSupport;
@@ -1588,6 +1604,7 @@ ModuleExport void UnregisterJPEGImage(void)
   (void) UnregisterMagickInfo("PJPG");
   (void) UnregisterMagickInfo("JPEG");
   (void) UnregisterMagickInfo("JPG");
+  (void) UnregisterMagickInfo("JPE");
 }