]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 28 Jul 2011 23:25:33 +0000 (23:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 28 Jul 2011 23:25:33 +0000 (23:25 +0000)
MagickCore/fx.c

index 9812d2b9975fc88027bc2d54aca62d249107a8bf..ccd607dd730ba0e795d62c01052786ffa81fc31e 100644 (file)
@@ -1901,7 +1901,17 @@ static const char *FxOperatorPrecedence(const char *expression,
       case 'A':
       case 'a':
       {
-        if (LocaleNCompare(expression,"atan2",5) == 0)
+        if (LocaleNCompare(expression,"acosh",5) == 0)
+          {
+            expression+=5;
+            break;
+          }
+        if (LocaleNCompare(expression,"asinh",5) == 0)
+          {
+            expression+=5;
+            break;
+          }
+        if (LocaleNCompare(expression,"atanh",5) == 0)
           {
             expression+=5;
             break;
@@ -2332,6 +2342,12 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
             exception);
           return((MagickRealType) fabs((double) alpha));
         }
+      if (LocaleNCompare(expression,"acosh",5) == 0)
+        {
+          alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
+            exception);
+          return((MagickRealType) acosh((double) alpha));
+        }
       if (LocaleNCompare(expression,"acos",4) == 0)
         {
           alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
@@ -2349,6 +2365,12 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
           return(gamma*gamma);
         }
 #endif
+      if (LocaleNCompare(expression,"asinh",5) == 0)
+        {
+          alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
+            exception);
+          return((MagickRealType) asinh((double) alpha));
+        }
       if (LocaleNCompare(expression,"asin",4) == 0)
         {
           alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,
@@ -2367,6 +2389,12 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
             exception);
           return((MagickRealType) atan2((double) alpha,(double) *beta));
         }
+      if (LocaleNCompare(expression,"atanh",5) == 0)
+        {
+          alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+5,beta,
+            exception);
+          return((MagickRealType) atanh((double) alpha));
+        }
       if (LocaleNCompare(expression,"atan",4) == 0)
         {
           alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+4,beta,