(no commit message)

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index d5f6ac7b4b195225b6dbb13ac0980b99439df25b..6219af75eaa6b97f2f08bc8cc7c72ca0b6e8f58e 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -155,6 +155,7 @@ static const CoderMapInfo
     { "J2K", "JP2" },
     { "JPE", "JPEG" },
     { "JPG", "JPEG" },
+    { "JPS", "JPEG" },
     { "JPX", "JP2" },
     { "K", "RAW" },
     { "LOGO", "MAGICK" },

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b88768db052341025aeb1efb14282d594cd7fa6f..5fe99d667194c2d4c644d2871d989d8ffdf784ef 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1564,6 +1564,21 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->mime_type=ConstantString("image/jpeg");
   entry->module=ConstantString("JPEG");
   (void) RegisterMagickInfo(entry);
+  entry=SetMagickInfo("JPS");
+#if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
+  entry->thread_support=NoThreadSupport;
+#endif
+#if defined(MAGICKCORE_JPEG_DELEGATE)
+  entry->decoder=(DecodeImageHandler *) ReadJPEGImage;
+  entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
+#endif
+  entry->adjoin=MagickFalse;
+  entry->description=ConstantString(description);
+  if (*version != '\0')
+    entry->version=ConstantString(version);
+  entry->mime_type=ConstantString("image/jpeg");
+  entry->module=ConstantString("JPEG Stereoscopic");
+  (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PJPEG");
 #if (JPEG_LIB_VERSION < 80) && !defined(LIBJPEG_TURBO_VERSION)
   entry->thread_support=NoThreadSupport;
@@ -1605,8 +1620,9 @@ ModuleExport size_t RegisterJPEGImage(void)
 ModuleExport void UnregisterJPEGImage(void)
 {
   (void) UnregisterMagickInfo("PJPG");
-  (void) UnregisterMagickInfo("JPEG");
+  (void) UnregisterMagickInfo("JPS");
   (void) UnregisterMagickInfo("JPG");
+  (void) UnregisterMagickInfo("JPEG");
   (void) UnregisterMagickInfo("JPE");
 }
 
@@ -2141,6 +2157,9 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
+  if ((LocaleCompare(image_info->magick,"JPS") == 0) &&
+      (image->next != (Image *) NULL))
+    image=AppendImages(image,MagickFalse,exception);
   /*
     Initialize JPEG parameters.
   */