From: anthony <anthony@git.imagemagick.org>
Date: Thu, 22 Mar 2012 03:22:03 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5990
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d4f2c738994717dcb5735534ed157974795ea33;p=imagemagick

---

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 117f85a98..6454adac5 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4335,7 +4335,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand,
       /* handle respect-parenthesis */
       if ( IsMagickTrue(GetImageOption(cli_wand->wand.image_info,
                "respect-parenthesis")) != MagickFalse )
-        option="{";
+        option="{"; /* push image settings too */
       else
         return;
     }
@@ -4352,7 +4352,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand,
       for ( ; node != (Stack *)NULL; node=node->next)
         size++;
       if ( size >= MAX_STACK_DEPTH )
-        CLIWandExceptionReturn(OptionError,"ParenthesisNestedTooDeeply",option);
+        CLIWandExceptionReturn(OptionError,"CurlyBracesNestedTooDeeply",option);
       node=(Stack *) AcquireMagickMemory(sizeof(*node));
       if (node == (Stack *) NULL)
         CLIWandExceptionReturn(ResourceLimitFatalError,
@@ -4387,13 +4387,13 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand,
       cli_wand->wand.images= (Image *)node->data;
       node = (Stack *)RelinquishMagickMemory(node);
 
-      /* handle respect-parenthesis - of the previous 'push' settings */
+      /* handle respect-parenthesis - of the previous 'pushed' settings */
       node = cli_wand->image_info_stack;
       if ( node != (Stack *)NULL)
         {
           if (IsMagickTrue(GetImageOption((ImageInfo *)node->data,
                  "respect-parenthesis")) != MagickFalse )
-          { option="}"; fprintf(stderr, "close\n"); }
+            option="}"; /* pop image settings too */
           else
             return;
         }
@@ -4407,7 +4407,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand,
 
       node = (void *)cli_wand->image_info_stack;
       if ( node == (Stack *)NULL)
-        CLIWandExceptionReturn(OptionError,"UnbalancedParenthesis",option);
+        CLIWandExceptionReturn(OptionError,"UnbalancedCurlyBraces",option);
       cli_wand->image_info_stack = node->next;
 
       (void) DestroyImageInfo(cli_wand->wand.image_info);
diff --git a/config/english.xml b/config/english.xml
index 5e6e03ae5..abfe9692a 100644
--- a/config/english.xml
+++ b/config/english.xml
@@ -592,6 +592,9 @@
         <message name="CompositeImageRequired">
           composite image required
         </message>
+        <message name="CurlyBrasesNestedTooDeeply">
+          curly braces nested too deeply
+        </message>
         <message name="DeprecatedOption">
           option is deprecated
         </message>
diff --git a/config/francais.xml b/config/francais.xml
index 32949f202..4ae0531af 100644
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -580,9 +580,15 @@
     </module>
     <option>
       <error>
+        <message name="ClutImageRequired">
+          color lookup table image requise
+        </message>
         <message name="CompositeImageRequired">
           image composite requise
         </message>
+        <message name="CurlyBrasesNestedTooDeeply">
+          trop d'imbrication de curly braces
+        </message>
         <message name="DepreciatedOption">
           option est obsolète
         </message>