(no commit message)

[imagemagick] / MagickWand / identify.c

diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index f294c9a936c121c872426edd72be60b6585973ad..435ee5a4cc6c6e89d78bfeee979da7d2d0946509 100644 (file)
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -124,6 +124,7 @@ static MagickBooleanType IdentifyUsage(void)
       "                     define one or more image format options",
       "-density geometry    horizontal and vertical density of the image",
       "-depth value         image depth",
+      "-endian type         endianness (MSB or LSB) of the image",
       "-extract geometry    extract area from image",
       "-features distance   analyze image features (e.g. contrast, correlation)",
       "-format \"string\"     output formatted image characteristics",
@@ -132,6 +133,7 @@ static MagickBooleanType IdentifyUsage(void)
       "-interlace type      type of image interlacing scheme",
       "-interpolate method  pixel color interpolation method",
       "-limit type value    pixel cache resource limit",
+      "-mask filename       associate a mask with the image",
       "-monitor             monitor progress",
       "-ping                efficiently determine image attributes",
       "-quiet               suppress all warning messages",
@@ -366,10 +368,11 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaChannelOptions,MagickFalse,
+              argv[i]);
             if (type < 0)
-              ThrowIdentifyException(OptionError,"UnrecognizedAlphaChannelType",
-                argv[i]);
+              ThrowIdentifyException(OptionError,
+                "UnrecognizedAlphaChannelOption",argv[i]);
             break;
           }
         if (LocaleCompare("antialias",option+1) == 0)
@@ -518,6 +521,27 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
           }
         ThrowIdentifyException(OptionError,"UnrecognizedOption",option)
       }
+      case '3':
+      {
+        if (LocaleCompare("endian",option+1) == 0)
+          {
+            ssize_t
+              endian;
+
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (ssize_t) (argc-1))
+              ThrowIdentifyException(OptionError,"MissingArgument",option);
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
+              argv[i]);
+            if (endian < 0)
+              ThrowIdentifyException(OptionError,"UnrecognizedEndianType",
+                argv[i]);
+            break;
+          }
+        ThrowIdentifyException(OptionError,"UnrecognizedOption",option)
+      }
       case 'f':
       {
         if (LocaleCompare("features",option+1) == 0)
@@ -678,6 +702,15 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
       }
       case 'm':
       {
+        if (LocaleCompare("mask",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (ssize_t) (argc-1))
+              ThrowIdentifyException(OptionError,"MissingArgument",option);
+            break;
+          }
         if (LocaleCompare("matte",option+1) == 0)
           break;
         if (LocaleCompare("monitor",option+1) == 0)