Changeset 192

Timestamp:

09/23/09 06:40:25 (6 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/coders/cals.c (modified) (4 diffs)
• ImageMagick/trunk/coders/pdf.c (modified) (1 diff)
• ImageMagick/trunk/coders/ps2.c (modified) (1 diff)
• ImageMagick/trunk/coders/ps3.c (modified) (1 diff)
• ImageMagick/trunk/config/coder.xml (modified) (1 diff)
• ImageMagick/trunk/magick/coder.c (modified) (1 diff)
• VisualMagick/trunk/bin/coder.xml (modified) (1 diff)
• VisualMagick/trunk/configure/configure.exe (modified) (previous)

ImageMagick/trunk/coders/cals.c

@@ -237 +237 @@
     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);
@@ -392 +400 @@
     *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);
@@ -425 +456 @@
 ModuleExport void UnregisterCALSImage(void)
 {
+  (void) UnregisterMagickInfo("CAL");
   (void) UnregisterMagickInfo("CALS");
 }
@@ -525 +557 @@
   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);

ImageMagick/trunk/coders/pdf.c

@@ -922 +922 @@
   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);

ImageMagick/trunk/coders/ps2.c

@@ -251 +251 @@
   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);

ImageMagick/trunk/coders/ps3.c

@@ -265 +265 @@
   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);

ImageMagick/trunk/config/coder.xml

@@ -25 +25 @@
   <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"/>

ImageMagick/trunk/magick/coder.c

@@ -87 +87 @@
     "  <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\" />"

VisualMagick/trunk/bin/coder.xml

@@ -22 +22 @@
   <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"/>