(no commit message)

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 117f85a98b343349e6420375f2d03dab4f035f4d..6454adac55f3d9132a99f4d8a9f1a6ed160fc90a 100644 (file)
--- 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 5e6e03ae55df858babddcebc989dcf8c237ed458..abfe9692a299db96829e10a89c0a4cb6cdf73011 100644 (file)
--- 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 32949f202e47f4ba69b6ee6be7e2c335b19faf64..4ae0531af1e233ef540d7c4f73dbf0861d042fa0 100644 (file)
--- 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>