From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 23 Sep 2009 13:40:25 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca5955485adc09678f63b726b5009eb8d28cb66;p=imagemagick

---

diff --git a/coders/cals.c b/coders/cals.c
index 154f2d62d..5f4fe6321 100644
--- 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");
 }
 
@@ -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 13bfb24f0..6234c88bf 100644
--- 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 74be992ff..779ce6784 100644
--- 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 401a3f51c..f4ef549ab 100644
--- 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 9930c22d3..7d67e26ba 100644
--- 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 70f77f902..a19bbe5ed 100644
--- 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\" />"