Changeset 11591 for ImageMagick/trunk

Timestamp:

07/07/08 17:35:19 (2 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• coders/caption.c (modified) (1 diff)
• magick/image.c (modified) (4 diffs)

ImageMagick/trunk/coders/caption.c

@@ -244 +244 @@
   entry->decoder=(DecodeImageHandler *) ReadCAPTIONImage;
   entry->adjoin=MagickFalse;
-  entry->format_type=ExplicitFormatType;
+  entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Image caption");
   entry->module=ConstantString("CAPTION");

ImageMagick/trunk/magick/image.c

@@ -3108 +3108 @@
 %  SetImageAlphaChannel() activates, deactivates, resets, or sets the alpha
 %  channel.
-%  
+%
 %  The format of the SetImageAlphaChannel method is:
 %
@@ -3571 +3571 @@
       LocaleUpper(magic);
       /*
-        Look for format_type image formats.
+        Look for explicit image formats.
       */
-      format_type=ImplicitFormatType;
+      format_type=UndefinedFormatType;
       if ((LocaleNCompare(image_info->magick,"SGI",3) == 0) &&
           (LocaleCompare(magic,"RGB") == 0))
@@ -3589 +3589 @@
       if ((magick_info != (const MagickInfo *) NULL) &&
           (magick_info->format_type != UndefinedFormatType))
-        format_type=magick_info->format_type;
-      if (format_type == ImplicitFormatType)
+        format_type=format_type;
+      if (format_type == UndefinedFormatType)
         (void) CopyMagickString(image_info->magick,magic,MaxTextExtent);
       else
@@ -3608 +3608 @@
         User specified image format.
       */
-      if (LocaleCompare(magic,"GRADATION") == 0)
-        (void) CopyMagickString(magic,"GRADIENT",MaxTextExtent);
       LocaleUpper(magic);
       if (IsMagickConflict(magic) == MagickFalse)