(no commit message)

diff --git a/MagickCore/channel.h b/MagickCore/channel.h
index 405759dec775fc5d96da20466ab7e7a7dd693549..cd6d3138d961a45763c5a7e4b6d4c0d6d6af8bdc 100644 (file)
--- a/MagickCore/channel.h
+++ b/MagickCore/channel.h
@@ -30,7 +30,7 @@ extern MagickExport Image
 
 extern MagickExport MagickBooleanType
   GetImageAlphaChannel(const Image *),
-  SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *);
+  SetImageAlphaChannel(Image *,const AlphaChannelOption,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/image.c b/MagickCore/image.c
index c3163b1b6d16c4d8330bf361bf3919bcbc3cb34b..b1545c1ce9a0e0ad5f744d03cd4e5956f6ab1fde 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2051,7 +2051,7 @@ MagickExport MagickBooleanType ResetImagePage(Image *image,const char *page)
 %  The format of the SetImageAlphaChannel method is:
 %
 %      MagickBooleanType SetImageAlphaChannel(Image *image,
-%        const AlphaChannelType alpha_type,ExceptionInfo *exception)
+%        const AlphaChannelOption alpha_type,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2135,7 +2135,7 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p,
 }
 
 MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
-  const AlphaChannelType alpha_type,ExceptionInfo *exception)
+  const AlphaChannelOption alpha_type,ExceptionInfo *exception)
 {
   MagickBooleanType
     status;

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 92efa1ee6dc7109379a2c68e41426fe77a2058ba..02bf2c8e9d94153ca2efc2fb2cb15b1c9a727d72 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -41,7 +41,7 @@ typedef enum
   SetAlphaChannel,
   ShapeAlphaChannel,
   TransparentAlphaChannel
-} AlphaChannelType;
+} AlphaChannelOption;
 
 typedef enum
 {
@@ -518,7 +518,7 @@ extern MagickExport MagickBooleanType
   ModifyImage(Image **,ExceptionInfo *),
   ResetImagePage(Image *,const char *),
   SetImageAlpha(Image *,const Quantum,ExceptionInfo *),
-  SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *),
+  SetImageAlphaChannel(Image *,const AlphaChannelOption,ExceptionInfo *),
   SetImageBackgroundColor(Image *,ExceptionInfo *),
   SetImageColor(Image *,const PixelInfo *,ExceptionInfo *),
   SetImageExtent(Image *,const size_t,const size_t,ExceptionInfo *),

diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index a8f1a5c501fad7f90df6009a273523e1d8780cdd..f2591d1c581cef46d2d0f051f2f122d0904f8141 100644 (file)
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -481,7 +481,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
               ThrowAnimateException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowAnimateException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowAnimateException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index f2988cd2a5d81eb8fb40afd5a76d33abfdf1e00c..035109fe82c80cc58b8bd7e252ac46fb59281343 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -350,7 +350,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
               ThrowCompareException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowCompareException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowCompareException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 08429caf660bd4ae8288c2ad3a5bdecafc44b2de..986a1353081bf922d043298dcd4aa2a9344dddde 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -557,7 +557,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowCompositeException(OptionError,
-                "UnrecognizedAlphaChannelType",argv[i]);
+                "UnrecognizedAlphaChannelOption",argv[i]);
             break;
           }
         if (LocaleCompare("authenticate",option+1) == 0)

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 30eec2b1d4b79ec93d48d19a19397659d7b56793..b38f87a8c2af3d028ebe7090c54661f38ce29071 100644 (file)
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -668,7 +668,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowConvertException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowConvertException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/display.c b/MagickWand/display.c
index 1d157d8e331573554f5ea6c3e3c9ff5c7a70fa18..c8a117e0fda3d5d74ddf78e708dadf19190db3d2 100644 (file)
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -694,7 +694,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
               ThrowDisplayException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowDisplayException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowDisplayException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index 8289fe3fa495d01bc5ba025a3ae623666c29a7da..757078250c9ff865803e9832f29d6d0d966932e0 100644 (file)
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -369,7 +369,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
               ThrowIdentifyException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowIdentifyException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowIdentifyException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 33f8a94864d957d02814d2de98b1971a882eb1a3..ff3b2187439c019e7c47b7c89e115a4d34408a5a 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -8979,7 +8979,7 @@ WandExport MagickBooleanType MagickSetImage(MagickWand *wand,
 %  The format of the MagickSetImageAlphaChannel method is:
 %
 %      MagickBooleanType MagickSetImageAlphaChannel(MagickWand *wand,
-%        const AlphaChannelType alpha_type)
+%        const AlphaChannelOption alpha_type)
 %
 %  A description of each parameter follows:
 %
@@ -8990,7 +8990,7 @@ WandExport MagickBooleanType MagickSetImage(MagickWand *wand,
 %
 */
 WandExport MagickBooleanType MagickSetImageAlphaChannel(MagickWand *wand,
-  const AlphaChannelType alpha_type)
+  const AlphaChannelOption alpha_type)
 {
   assert(wand != (MagickWand *) NULL);
   assert(wand->signature == WandSignature);

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 771c28b5e4249f7f95eadb58f33066e70fe4952d..fa4d79c7edca2b015858c96715a2e6f6bbce0ec0 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -234,7 +234,7 @@ extern WandExport MagickBooleanType
   MagickSeparateImage(MagickWand *,const ChannelType),
   MagickSepiaToneImage(MagickWand *,const double),
   MagickSetImage(MagickWand *,const MagickWand *),
-  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelType),
+  MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelOption),
   MagickSetImageBackgroundColor(MagickWand *,const PixelWand *),
   MagickSetImageBluePrimary(MagickWand *,const double,const double),
   MagickSetImageBorderColor(MagickWand *,const PixelWand *),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index df249223bdfde1b30446bcb808bcb61bf26aa75d..659871a9a0a2a5bf08add059f563f32943ce68cf 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -792,11 +792,11 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
           }
         if (LocaleCompare("alpha",option+1) == 0)
           {
-            AlphaChannelType
+            AlphaChannelOption
               alpha_type;
 
             (void) SyncImageSettings(mogrify_info,*image,exception);
-            alpha_type=(AlphaChannelType) ParseCommandOption(MagickAlphaChannelOptions,
+            alpha_type=(AlphaChannelOption) ParseCommandOption(MagickAlphaChannelOptions,
               MagickFalse,argv[i+1]);
             (void) SetImageAlphaChannel(*image,alpha_type,exception);
             break;
@@ -3826,7 +3826,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowMogrifyException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowMogrifyException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index d21dcb61da998807839aa7d9adfc2e6513369971..8811d06c55aef68a555dd25bba34feaa2c57322b 100644 (file)
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -472,7 +472,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
               ThrowMontageException(OptionError,"MissingArgument",option);
             type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowMontageException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowMontageException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 8558b9975e8d6503b96d415d603f555d3c1521f3..0325f5062830ef61911275d94d95910f8166b211 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1756,9 +1756,9 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
         {
           parse=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,arg1);
           if (parse < 0)
-            CLIWandExceptArgBreak(OptionError,"UnrecognizedAlphaChannelType",
+            CLIWandExceptArgBreak(OptionError,"UnrecognizedAlphaChannelOption",
                  option,arg1);
-          (void) SetImageAlphaChannel(_image,(AlphaChannelType)parse,
+          (void) SetImageAlphaChannel(_image,(AlphaChannelOption)parse,
                _exception);
           break;
         }

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index a685424287734e58cc1e59d84199b6e76286885b..7b5feb93f6db13e56537e79939ed51724de21cbe 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -1112,7 +1112,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
               break;
             }
           for ( ; image; image=image->next)
-            (void) SetImageAlphaChannel(image,(AlphaChannelType) sp,exception);
+            (void) SetImageAlphaChannel(image,(AlphaChannelOption) sp,exception);
           break;
         }
       if (LocaleCompare(attribute,"antialias") == 0)

diff --git a/coders/msl.c b/coders/msl.c
index 19440588009ab6c337bb4352a13467fc88e92a33..af33f89d528410a7965854bb78dcff998972acde 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7953,7 +7953,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           if (alpha < 0)
             ThrowMSLException(OptionError,"UnrecognizedType",value);
           if (image != (Image *) NULL)
-            (void) SetImageAlphaChannel(image,(AlphaChannelType) alpha,
+            (void) SetImageAlphaChannel(image,(AlphaChannelOption) alpha,
               exception);
           break;
         }

diff --git a/config/english.xml b/config/english.xml
index 60efd801b42e22bc17e3b0f8760396711dccaa11..3c2d94419d22bc04e15eaf6c6424406308584eeb 100644 (file)
--- a/config/english.xml
+++ b/config/english.xml
@@ -312,8 +312,8 @@
           <message name="UnknownPatternType">
             unknown pattern type
           </message>
-          <message name="UnrecognizedAlphaChannelType">
-            unrecognized alpha channel tpe
+          <message name="UnrecognizedAlphaChannelOption">
+            unrecognized alpha channel option
           </message>
           <message name="UnrecognizedBitsPerPixel">
             unrecognized bits per pixel

diff --git a/config/francais.xml b/config/francais.xml
index 93e8f83082f8015f3fd37ed21ba55ef0b5fcd18c..7104b4013abd851e1cc301ddcc6b6cfd3ca9dbf1 100644 (file)
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -312,6 +312,9 @@
           <message name="UnknownPatternType">
             type de motif inconnu
           </message>
+          <message name="UnrecognizedAlphaChannelOption">
+            alpha de canal l'option non reconnus
+          </message>
           <message name="UnrecognizedBitsPerPixel">
             bits par pixel non reconnus
           </message>