diff options
| author | Cristy <urban-warrior@imagemagick.org> | 2020-01-06 06:48:06 -0500 |
|---|---|---|
| committer | Cristy <urban-warrior@imagemagick.org> | 2020-01-06 06:48:06 -0500 |
| commit | df1e09c4a7c775dd9e365b896bdc6ed0f0c2697c (patch) | |
| tree | faf9af90275857761e28b99f584db583a8bf3f22 | |
| parent | 76bd06053f880478b15bc9ae876322114946c9ba (diff) | |
| download | ImageMagick-df1e09c4a7c775dd9e365b896bdc6ed0f0c2697c.tar.gz | |
...
| -rw-r--r-- | MagickCore/fx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 82cd0011a..6af362636 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1446,12 +1446,14 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, double alpha, gamma, + sans, value; register const char *p; *beta=0.0; + sans=0.0; subexpression=AcquireString(expression); *subexpression='\0'; if (depth > FxMaxSubexpressionDepth) @@ -2163,13 +2165,12 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } for (*q='\0'; ; ) { - double sans = 0.0; alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,beta, exception); - alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, + gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, exception); - if (fabs(alpha) < MagickEpsilon) - FxReturn(*beta); + if (fabs(gamma) < MagickEpsilon) + break; } FxReturn(alpha); } @@ -2252,10 +2253,10 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } for (*q='\0'; ; ) { - alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, + gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, exception); - if (fabs(alpha) < MagickEpsilon) - FxReturn(*beta); + if (fabs(gamma) < MagickEpsilon) + break; alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,beta, exception); } @@ -2651,11 +2652,10 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, } for (*q='\0'; ; ) { - double sans = 0.0; - alpha=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, + gamma=FxEvaluateSubexpression(fx_info,channel,x,y,p,depth+1,&sans, exception); - if (fabs(alpha) < MagickEpsilon) - FxReturn(*beta); + if (fabs(gamma) < MagickEpsilon) + break; alpha=FxEvaluateSubexpression(fx_info,channel,x,y,q+1,depth+1,beta, exception); } |