From: cristy Date: Tue, 28 Aug 2012 11:36:48 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5047 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b15b06c9f7ba2bf0e0ebcd88d0175536a5392c93;p=imagemagick --- diff --git a/MagickCore/channel.h b/MagickCore/channel.h index 405759dec..cd6d3138d 100644 --- 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 c3163b1b6..b1545c1ce 100644 --- 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 92efa1ee6..02bf2c8e9 100644 --- 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 a8f1a5c50..f2591d1c5 100644 --- 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 f2988cd2a..035109fe8 100644 --- 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 08429caf6..986a13530 100644 --- 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 30eec2b1d..b38f87a8c 100644 --- 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 1d157d8e3..c8a117e0f 100644 --- 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 8289fe3fa..757078250 100644 --- 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 33f8a9486..ff3b21874 100644 --- 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 771c28b5e..fa4d79c7e 100644 --- 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 df249223b..659871a9a 100644 --- 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 d21dcb61d..8811d06c5 100644 --- 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 8558b9975..0325f5062 100644 --- 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 a68542428..7b5feb93f 100644 --- 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 194405880..af33f89d5 100644 --- 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 60efd801b..3c2d94419 100644 --- a/config/english.xml +++ b/config/english.xml @@ -312,8 +312,8 @@ unknown pattern type - - unrecognized alpha channel tpe + + unrecognized alpha channel option unrecognized bits per pixel diff --git a/config/francais.xml b/config/francais.xml index 93e8f8308..7104b4013 100644 --- a/config/francais.xml +++ b/config/francais.xml @@ -312,6 +312,9 @@ type de motif inconnu + + alpha de canal l'option non reconnus + bits par pixel non reconnus