]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 11 Sep 2014 16:48:44 +0000 (16:48 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 11 Sep 2014 16:48:44 +0000 (16:48 +0000)
MagickCore/option.c

index e0682b59ea5148beb74c1a3c233dcd148103d188..3da77083ce91e6dcda204abbfe0b94a225c78595 100644 (file)
@@ -2155,7 +2155,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option,
           }
         if (command_info->mnemonic == (const char *) NULL)
           return(-1);
-        if (*token == '!')
+        if (negate != MagickFalse)
           option_types=option_types &~ command_info->flags;
         else
           option_types=option_types | command_info->flags;
@@ -2182,7 +2182,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option,
           }
         if (option_info[i].mnemonic == (char *) NULL)
           return(-1);
-        if (*token == '!')
+        if (negate != MagickFalse)
           option_types=option_types &~ option_info[i].flags;
         else
           option_types=option_types | option_info[i].flags;
@@ -2745,7 +2745,7 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option,
             }
         if (command_info->mnemonic == (const char *) NULL)
           return(-1);
-        if (*token == '!')
+        if (negate != MagickFalse)
           option_types=option_types &~ command_info->type;
         else
           option_types=option_types | command_info->type;
@@ -2772,7 +2772,7 @@ MagickExport ssize_t ParseCommandOption(const CommandOption option,
           }
         if (option_info[i].mnemonic == (char *) NULL)
           return(-1);
-        if (*token == '!')
+        if (negate != MagickFalse)
           option_types=option_types &~ option_info[i].type;
         else
           option_types=option_types | option_info[i].type;