(no commit message)

diff --git a/coders/cals.c b/coders/cals.c
index 154f2d62d48f5b6646abc53a700334fa1087ad0e..5f4fe6321ac9689b5917151f9375fee7091035fa 100644 (file)
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -236,6 +236,14 @@ static Image *Huffman2DDecodeImage(const ImageInfo *image_info,Image *image,
   (void) FormatMagickString(read_info->filename,MaxTextExtent,"tiff:%.1024s",
     filename);
   huffman_image=ReadImage(read_info,exception);
+  if (huffman_image != (Image *) NULL)
+    {
+      (void) CopyMagickString(huffman_image->filename,image_info->filename,
+        MaxTextExtent);
+      (void) CopyMagickString(huffman_image->magick_filename,
+         image_info->filename,MaxTextExtent);
+      (void) CopyMagickString(huffman_image->magick,"CALS",MaxTextExtent);
+    }
   read_info=DestroyImageInfo(read_info);
   (void) RelinquishUniqueFileResource(filename);
   return(huffman_image);
@@ -391,13 +399,36 @@ ModuleExport unsigned long RegisterCALSImage(void)
   MagickInfo
     *entry;
 
+  static const char
+    *CALSDescription=
+    {
+      "Continuous Acquisition and Life-cycle Support Type 1 Image"
+    },
+    *CALSNote=
+    {
+      "Specified in MIL-R-28002 and MIL-PRF-28002"
+    };
+
+  entry=SetMagickInfo("CAL");
+  entry->decoder=(DecodeImageHandler *) ReadCALSImage;
+#if defined(MAGICKCORE_TIFF_DELEGATE)
+  entry->encoder=(EncodeImageHandler *) WriteCALSImage;
+#endif
+  entry->adjoin=MagickFalse;
+  entry->magick=(IsImageFormatHandler *) IsCALS;
+  entry->description=ConstantString(CALSDescription);
+  entry->note=ConstantString(CALSNote);
+  entry->module=ConstantString("CALS");
+  (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("CALS");
   entry->decoder=(DecodeImageHandler *) ReadCALSImage;
+#if defined(MAGICKCORE_TIFF_DELEGATE)
   entry->encoder=(EncodeImageHandler *) WriteCALSImage;
+#endif
   entry->adjoin=MagickFalse;
   entry->magick=(IsImageFormatHandler *) IsCALS;
-  entry->description=ConstantString("Automated Interchange of Technical "
-    "Information, MIL-STD-1840A");
+  entry->description=ConstantString(CALSDescription);
+  entry->note=ConstantString(CALSNote);
   entry->module=ConstantString("CALS");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
@@ -424,6 +455,7 @@ ModuleExport unsigned long RegisterCALSImage(void)
 */
 ModuleExport void UnregisterCALSImage(void)
 {
+  (void) UnregisterMagickInfo("CAL");
   (void) UnregisterMagickInfo("CALS");
 }
 \f
@@ -524,6 +556,7 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   write_info=CloneImageInfo(image_info);
   SetImageInfoFile(write_info,file);
   write_info->compression=Group4Compression;
+  write_info->type=BilevelType;
   (void) SetImageOption(write_info,"quantum:polarity","min-is-white");
   status=WriteImage(write_info,huffman_image);
   (void) fflush(file);

diff --git a/coders/pdf.c b/coders/pdf.c
index 13bfb24f03337c3dea41c4fb7a5ee1d7e1d3741a..6234c88bfc3ace2521d36893e63484664ba36ae9 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -921,6 +921,7 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   write_info=CloneImageInfo(image_info);
   SetImageInfoFile(write_info,file);
   write_info->compression=Group4Compression;
+  write_info->type=BilevelType;
   (void) SetImageOption(write_info,"quantum:polarity","min-is-white");
   status=WriteImage(write_info,huffman_image);
   (void) fflush(file);

diff --git a/coders/ps2.c b/coders/ps2.c
index 74be992ffb936ae22bb88b7b07a0c5eb61449df5..779ce6784e9ccf9806f8aa8747b4085849a85fa5 100644 (file)
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -250,6 +250,7 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   write_info=CloneImageInfo(image_info);
   SetImageInfoFile(write_info,file);
   write_info->compression=Group4Compression;
+  write_info->type=BilevelType;
   (void) SetImageOption(write_info,"quantum:polarity","min-is-white");
   status=WriteImage(write_info,huffman_image);
   (void) fflush(file);

diff --git a/coders/ps3.c b/coders/ps3.c
index 401a3f51ccac6b076b2dc8621244a4899e53011d..f4ef549abc0dcb2a6c9bc012f03c3ed6d46d532f 100644 (file)
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -264,6 +264,7 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   write_info=CloneImageInfo(image_info);
   SetImageInfoFile(write_info,file);
   write_info->compression=Group4Compression;
+  write_info->type=BilevelType;
   (void) SetImageOption(write_info,"quantum:polarity","min-is-white");
   status=WriteImage(write_info,huffman_image);
   (void) fflush(file);

diff --git a/config/coder.xml b/config/coder.xml
index 9930c22d31556ba2d3e7476bfd69e69c55fa6dcd..7d67e26ba78335376569049127e73bacfd9c1ec2 100644 (file)
--- a/config/coder.xml
+++ b/config/coder.xml
@@ -24,6 +24,7 @@
   <coder magick="BRG" name="RGB"/>
   <coder magick="CMYKA" name="CMYK"/>
   <coder magick="C" name="RAW"/>
+  <coder magick="CAL" name="CALS"/>
   <coder magick="CR2" name="DNG"/>
   <coder magick="CRW" name="DNG"/>
   <coder magick="CUR" name="ICON"/>

diff --git a/magick/coder.c b/magick/coder.c
index 70f77f902913800b5c295005980a89150df089d2..a19bbe5ed36f85327ffd678288ba8f51feec7e0f 100644 (file)
--- a/magick/coder.c
+++ b/magick/coder.c
@@ -86,6 +86,7 @@ static const char
     "  <coder magick=\"BRF\" name=\"BRAILLE\" />"
     "  <coder magick=\"CMYKA\" name=\"CMYK\" />"
     "  <coder magick=\"C\" name=\"GRAY\" />"
+    "  <coder magick=\"CAL\" name=\"CALS\" />"
     "  <coder magick=\"CR2\" name=\"DNG\" />"
     "  <coder magick=\"CRW\" name=\"DNG\" />"
     "  <coder magick=\"CUR\" name=\"ICON\" />"