From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 30 Jan 2012 01:24:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6301
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6180838cb97473afec7c383da0a4df02f2a29f40;p=imagemagick

---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index ddc5cbe82..eaa7b807a 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2591,7 +2591,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       status=SetImageAlpha(image,OpaqueAlpha,exception);
       break;
     }
-    case FlattenAlphaChannel:
+    case RemoveAlphaChannel:
     {
       CacheView
         *image_view;
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 5fdd1bcad..6d4f8019a 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -36,10 +36,10 @@ typedef enum
   DeactivateAlphaChannel,
   ExtractAlphaChannel,
   OpaqueAlphaChannel,
+  RemoveAlphaChannel,
   SetAlphaChannel,
   ShapeAlphaChannel,
-  TransparentAlphaChannel,
-  FlattenAlphaChannel
+  TransparentAlphaChannel
 } AlphaChannelType;
 
 typedef enum
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 4024c49d5..a16a3aadf 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -98,10 +98,10 @@ static const OptionInfo
     { "Copy", CopyAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Deactivate", DeactivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Extract", ExtractAlphaChannel, UndefinedOptionFlag, MagickFalse },
-    { "Flatten", FlattenAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Off", DeactivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "On", ActivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Opaque", OpaqueAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Remove", RemoveAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Set", SetAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Shape", ShapeAlphaChannel, UndefinedOptionFlag, MagickFalse },
     { "Reset", SetAlphaChannel, DeprecateOptionFlag, MagickTrue },