From 60116eeaad45e5143bef613831c125430b8edaab Mon Sep 17 00:00:00 2001 From: Cristy Date: Mon, 21 Nov 2016 07:21:00 -0500 Subject: [PATCH] https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30897 --- MagickCore/option.c | 4 ++-- MagickWand/operation.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MagickCore/option.c b/MagickCore/option.c index 3910fee3e..a4fe6273b 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -675,8 +675,8 @@ static const OptionInfo { "+render", 0L, DrawInfoOptionFlag, MagickFalse }, { "+resample", 1L, DeprecateOptionFlag, MagickTrue }, { "-resample", 1L, SimpleOperatorFlag, MagickFalse }, - { "-respect-parenthesis", 0L, ImageInfoOptionFlag, MagickFalse }, - { "+respect-parenthesis", 0L, ImageInfoOptionFlag, MagickFalse }, + { "-respect-parentheses", 0L, ImageInfoOptionFlag, MagickFalse }, + { "+respect-parentheses", 0L, ImageInfoOptionFlag, MagickFalse }, { "+reverse", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue }, { "-reverse", 0L, ListOperatorFlag | FireOptionFlag, MagickFalse }, { "+roll", 1L, DeprecateOptionFlag, MagickTrue }, diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 14d3795f6..c675deeb2 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -1296,7 +1296,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, _draw_info->render= ArgBooleanNot; break; } - if (LocaleCompare("respect-parenthesis",option+1) == 0) + if (LocaleCompare("respect-parentheses",option+1) == 0) { /* link image and setting stacks - option is itself saved on stack! */ (void) SetImageOption(_image_info,option+1,ArgBooleanString); @@ -4786,9 +4786,9 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, cli_wand->image_list_stack = node; cli_wand->wand.images = NewImageList(); - /* handle respect-parenthesis */ + /* handle respect-parentheses */ if (IsStringTrue(GetImageOption(cli_wand->wand.image_info, - "respect-parenthesis")) != MagickFalse) + "respect-parentheses")) != MagickFalse) option="{"; /* fall-thru so as to push image settings too */ else break; @@ -4842,12 +4842,12 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, cli_wand->wand.images= (Image *)node->data; node = (Stack *)RelinquishMagickMemory(node); - /* handle respect-parenthesis - of the previous 'pushed' settings */ + /* handle respect-parentheses - of the previous 'pushed' settings */ node = cli_wand->image_info_stack; if ( node != (Stack *) NULL) { if (IsStringTrue(GetImageOption( - cli_wand->wand.image_info,"respect-parenthesis")) != MagickFalse) + cli_wand->wand.image_info,"respect-parentheses")) != MagickFalse) option="}"; /* fall-thru so as to pop image settings too */ else break; -- 2.40.0