(no commit message)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index ddc5cbe829b591283032d63b578f9a94795ecaca..eaa7b807a2a6d9ca5e720d4bda00679c3cb5b25e 100644 (file)
--- 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 5fdd1bcadc9ba850ba4ad99789eab2124a93ad58..6d4f8019a769b1c1a124a04305296cd022f93f66 100644 (file)
--- 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 4024c49d5c270e767c1bc2181c9f583140c23f8f..a16a3aadf6b3155b7d85bfc9e82e8c36c6c892bd 100644 (file)
--- 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 },