(no commit message)

[imagemagick] / MagickWand / compare.c

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 6d4cefbfcb3d81dd3d939dc3d1dfdf31c4b59a9d..f7c5e0b5a06bc4d003376c32923115bbb1e745af 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -160,7 +160,7 @@ static MagickBooleanType CompareUsage(void)
   for (p=miscellaneous; *p != (char *) NULL; p++)
     (void) printf("  %s\n",*p);
   (void) printf(
-    "\nBy default, the image format of `file' is determined by its magic\n");
+    "\nBy default, the image format of 'file' is determined by its magic\n");
   (void) printf(
     "number.  To specify a particular image format, precede the filename\n");
   (void) printf(
@@ -190,14 +190,14 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
 { \
   if (exception->severity < (asperity)) \
     (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag, \
-      "`%s'",option); \
+      "'%s'",option); \
   DestroyCompare(); \
   return(MagickFalse); \
 }
 #define ThrowCompareInvalidArgumentException(option,argument) \
 { \
   (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \
-    "InvalidArgument","`%s': %s",option,argument); \
+    "InvalidArgument","'%s': %s",option,argument); \
   DestroyCompare(); \
   return(MagickFalse); \
 }
@@ -348,9 +348,9 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,argv[i]);
             if (type < 0)
-              ThrowCompareException(OptionError,"UnrecognizedAlphaChannelType",
+              ThrowCompareException(OptionError,"UnrecognizedAlphaChannelOption",
                 argv[i]);
             break;
           }
@@ -392,7 +392,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             if (channel < 0)
               ThrowCompareException(OptionError,"UnrecognizedChannelType",
                 argv[i]);
-            SetPixelChannelMapMask(image,(ChannelType) channel);
+            SetPixelChannelMask(image,(ChannelType) channel);
             break;
           }
         if (LocaleCompare("colorspace",option+1) == 0)
@@ -1068,7 +1068,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (void) FormatLocaleFile(stderr,"    blue: %g (%g)\n",
                     QuantumRange*channel_distortion[BluePixelChannel],
                     channel_distortion[BluePixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g (%g)\n",
                       QuantumRange*channel_distortion[AlphaPixelChannel],
                       channel_distortion[AlphaPixelChannel]);
@@ -1088,7 +1088,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (void) FormatLocaleFile(stderr,"    black: %g (%g)\n",
                     QuantumRange*channel_distortion[BlackPixelChannel],
                     channel_distortion[BlackPixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g (%g)\n",
                       QuantumRange*channel_distortion[AlphaPixelChannel],
                       channel_distortion[AlphaPixelChannel]);
@@ -1099,7 +1099,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                   (void) FormatLocaleFile(stderr,"    gray: %g (%g)\n",
                     QuantumRange*channel_distortion[GrayPixelChannel],
                     channel_distortion[GrayPixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g (%g)\n",
                       QuantumRange*channel_distortion[AlphaPixelChannel],
                       channel_distortion[AlphaPixelChannel]);
@@ -1126,7 +1126,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                     channel_distortion[GreenPixelChannel]);
                   (void) FormatLocaleFile(stderr,"    blue: %g\n",
                     channel_distortion[BluePixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g\n",
                       channel_distortion[AlphaPixelChannel]);
                   break;
@@ -1141,7 +1141,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                     channel_distortion[YellowPixelChannel]);
                   (void) FormatLocaleFile(stderr,"    black: %g\n",
                     channel_distortion[BlackPixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g\n",
                       channel_distortion[AlphaPixelChannel]);
                   break;
@@ -1150,7 +1150,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
                 {
                   (void) FormatLocaleFile(stderr,"    gray: %g\n",
                     channel_distortion[GrayPixelChannel]);
-                  if (image->matte != MagickFalse)
+                  if (image->alpha_trait == BlendPixelTrait)
                     (void) FormatLocaleFile(stderr,"    alpha: %g\n",
                       channel_distortion[AlphaPixelChannel]);
                   break;