lut expressions: atan2

Author: pinterf

common/parser/parser.cpp

@@ -139,7 +139,7 @@ Parser::Parser Parser::getDefaultParser()
    /* ternary operator */
    parser.addSymbol(Symbol::Interrogation);
    /* function */
-   parser.addSymbol(Symbol::Abs).addSymbol(Symbol::Acos).addSymbol(Symbol::Asin).addSymbol(Symbol::Atan).addSymbol(Symbol::Cos).addSymbol(Symbol::Exp).addSymbol(Symbol::Log).addSymbol(Symbol::Sin).addSymbol(Symbol::Tan).addSymbol(Symbol::Min).addSymbol(Symbol::Max).addSymbol(Symbol::Clip);
+   parser.addSymbol(Symbol::Abs).addSymbol(Symbol::Acos).addSymbol(Symbol::Asin).addSymbol(Symbol::Atan).addSymbol(Symbol::Atan2).addSymbol(Symbol::Cos).addSymbol(Symbol::Exp).addSymbol(Symbol::Log).addSymbol(Symbol::Sin).addSymbol(Symbol::Tan).addSymbol(Symbol::Min).addSymbol(Symbol::Max).addSymbol(Symbol::Clip);
    /* rounding */
    parser.addSymbol(Symbol::Round).addSymbol(Symbol::Floor).addSymbol(Symbol::Trunc).addSymbol(Symbol::Ceil);
    /* number */

common/parser/symbol.cpp

@@ -51,13 +51,15 @@ static double mtmabs            (double x) { return abs(x); }
 static double mtacos            (double x) { return acos(x); }
 static double mtasin            (double x) { return asin(x); }
 static double mtatan            (double x) { return atan(x); }
+static double mtatan2           (double y, double x) { return atan2(y, x); }
 static double mtround           (double x) { return double(convert<Int64, double>( x )); }
 static double mtclip            (double x, double y, double z) { return clip<double, double>( x, y, z ); }
 static double mtmin             (double x, double y) { return min<double>( x, y ); }
 static double mtmax             (double x, double y) { return max<double>( x, y ); }
 static double mtfloor           (double x) { return floor(x); }
 static double mtceil            (double x) { return ceil(x); }
 static double mttrunc           (double x) { return double(Int64(x)); }
+
 // bit depth conversion helpers. x:value on 8 bit scale y: target bit depth 8-32 z:base bit depth
 static double do_upscaleByShift(double x, int y, int z, bool chroma, bool shift_float)
 {
@@ -236,6 +238,7 @@ Symbol Symbol::Log            ("log", FUNCTION, mtlog);
 Symbol Symbol::Exp            ("exp", FUNCTION, mtexp);
 Symbol Symbol::Abs            ("abs", FUNCTION, mtmabs);
 Symbol Symbol::Atan           ("atan", FUNCTION, mtatan);
+Symbol Symbol::Atan2          ("atan2", FUNCTION, mtatan2);
 Symbol Symbol::Acos           ("acos", FUNCTION, mtacos);
 Symbol Symbol::Asin           ("asin", FUNCTION, mtasin);
 Symbol Symbol::Round          ("round", FUNCTION, mtround);

common/parser/symbol.h

@@ -165,6 +165,7 @@ class Symbol {
    static Symbol Exp;
    static Symbol Acos;
    static Symbol Atan;
+   static Symbol Atan2;
    static Symbol Asin;
    static Symbol Round;
    static Symbol Clip;

masktools/helpers/parser/spirit.cpp

@@ -141,6 +141,7 @@ struct Syntax :
                  (str_p("tan") >> '(' >> (termter) >> ')')[AddNamedSymbol("tan", self.rpn)] |
                  (str_p("exp") >> '(' >> (termter) >> ')')[AddNamedSymbol("exp", self.rpn)] |
                  (str_p("log") >> '(' >> (termter) >> ')')[AddNamedSymbol("log", self.rpn)] |
+                 (str_p("atan2") >> '(' >> (termter) >> ',' >> (termter) >> ')')[AddNamedSymbol("atan2", self.rpn)] |
                  (str_p("atan") >> '(' >> (termter) >> ')')[AddNamedSymbol("atan", self.rpn)] |
                  (str_p("acos") >> '(' >> (termter) >> ')')[AddNamedSymbol("acos", self.rpn)] |
                  (str_p("asin") >> '(' >> (termter) >> ')')[AddNamedSymbol("asin", self.rpn)] |