diff --git a/Modules/Core/Common/include/otbMath.h b/Modules/Core/Common/include/otbMath.h
index 7b66ec4776b0a7ccf1411dd5860b7a1cc52ab0a1..745e4c5e29b6342b7a76f024502ec047a36f9561 100644
--- a/Modules/Core/Common/include/otbMath.h
+++ b/Modules/Core/Common/include/otbMath.h
@@ -46,14 +46,14 @@ constexpr double CONST_LOG10E =   0.43429448190325182765;  /* log_10 e */
 constexpr double CONST_LN2 =      0.69314718055994530942;  /* log_e 2 */
 constexpr double CONST_LN10 =     2.30258509299404568402;  /* log_e 10 */
 constexpr double CONST_PI =       3.14159265358979323846;  /* pi */
-constexpr double CONST_PI_2 =     1.57079632679489661923;  /* pi/2 */
-constexpr double CONST_PI_4 =     0.78539816339744830962;  /* pi/4 */
-constexpr double CONST_PI_8 =     0.39269908169872415481;  /* pi/8 */
-constexpr double CONST_1_PI =     0.31830988618379067154;  /* 1/pi */
-constexpr double CONST_2_PI =     0.63661977236758134308;  /* 2/pi */
-constexpr double CONST_2PI =      6.28318530717958647693;  /* 2*pi */
-constexpr double CONST_PI_180 =   0.01745329251994329577;  /* pi/180 */
-constexpr double CONST_180_PI =   57.2957795130823208768;  /* 180/pi */
+constexpr double CONST_PI_2 =     CONST_PI / 2.0;  /* pi/2 */
+constexpr double CONST_PI_4 =     CONST_PI / 4.0;  /* pi/4 */
+constexpr double CONST_PI_8 =     CONST_PI / 8.0;  /* pi/8 */
+constexpr double CONST_1_PI =     1.0 / CONST_PI;  /* 1/pi */
+constexpr double CONST_2_PI =     2.0 / CONST_PI;  /* 2/pi */
+constexpr double CONST_2PI =      2.0 * CONST_PI;  /* 2*pi */
+constexpr double CONST_PI_180 =   CONST_PI / 180.0;  /* pi/180 */
+constexpr double CONST_180_PI =   180.0 / CONST_PI;  /* 180/pi */
 const     double CONST_LNPI =     std::log(CONST_PI);      /* ln(pi)*/
 const     double CONST_SQRTPI =   std::sqrt(CONST_PI);     /* sqrt(pi)*/
 constexpr double CONST_2_SQRTPI = 1.12837916709551257390;  /* 2/sqrt(pi) */
@@ -67,27 +67,27 @@ constexpr double CONST_EULER =    0.57721566490153286060;  /* euler constant*/
    GNU extension.  Provide enough digits for the 128-bit IEEE quad.  */
 #ifdef __USE_GNU
 
-const long double CONST_El =        2.7182818284590452353602874713526625L;  /* e */
-const long double CONST_LOG2El =    1.4426950408889634073599246810018921L;  /* log_2 e */
-const long double CONST_LOG10El =   0.4342944819032518276511289189166051L;  /* log_10 e */
-const long double CONST_LN2l =      0.6931471805599453094172321214581766L;  /* log_e 2 */
-const long double CONST_LN10l =     2.3025850929940456840179914546843642L;  /* log_e 10 */
-const long double CONST_PIl =       3.1415926535897932384626433832795029L;  /* pi */
-const long double CONST_PI_2l =     1.5707963267948966192313216916397514L;  /* pi/2 */
-const long double CONST_PI_4l =     0.7853981633974483096156608458198757L;  /* pi/4 */
-const long double CONST_PI_8l =     0.3926990816987241548078304229099379L;  /* pi/8 */
-const long double CONST_2_PIl =     0.6366197723675813430755350534900574L;  /* 2/pi */
-const long double CONST_2_SQRTPIl = 1.1283791670955125738961589031215452L;  /* 2/sqrt(pi) */
-const long double CONST_2PIl =      6.2831853071795864769252867665590058L;  /* 2*pi */
-const long double CONST_PI_180l =   0.0174532925199432957692369076848861L;  /* pi/180 */
-const long double CONST_180_PIl =   57.295779513082320876798154814105170L;  /* 180/pi */
+constexpr long double CONST_El =        2.7182818284590452353602874713526625L;  /* e */
+constexpr long double CONST_LOG2El =    1.4426950408889634073599246810018921L;  /* log_2 e */
+constexpr long double CONST_LOG10El =   0.4342944819032518276511289189166051L;  /* log_10 e */
+constexpr long double CONST_LN2l =      0.6931471805599453094172321214581766L;  /* log_e 2 */
+constexpr long double CONST_LN10l =     2.3025850929940456840179914546843642L;  /* log_e 10 */
+constexpr long double CONST_PIl =       3.1415926535897932384626433832795029L;  /* pi */
+constexpr long double CONST_PI_2l =     CONST_PI / 2.0L;  /* pi/2 */
+constexpr long double CONST_PI_4l =     CONST_PI / 4.0L;  /* pi/4 */
+constexpr long double CONST_PI_8l =     CONST_PI / 8.0L;  /* pi/8 */
+constexpr long double CONST_2_PIl =     2.0L / CONST_PI;  /* 2/pi */
+constexpr long double CONST_2_SQRTPIl = 1.1283791670955125738961589031215452L;  /* 2/sqrt(pi) */
+constexpr long double CONST_2PIl =      2.0L * CONST_PI;  /* 2*pi */
+constexpr long double CONST_PI_180l =   CONST_PI / 180.0L;  /* pi/180 */
+constexpr long double CONST_180_PIl =   180.0L / CONST_PI;  /* 180/pi */
 // Defined but not used?
 //const long double CONST_LNPIl =     std::log(CONST_PIl);                    /* ln(pi)*/
 //const long double CONST_SQRTPIl =   std::sqrt(CONST_PIl);                   /* sqrt(pi)*/
-const long double CONST_SQRT2l =    1.4142135623730950488016887242096981L;  /* sqrt(2) */
-const long double CONST_SQRT1_2l =  0.7071067811865475244008443621048490L;  /* 1/sqrt(2) */
-const long double CONST_SQRT3l =    1.7320508075688772935274463415058724L;  /* sqrt(3) */
-const long double CONST_EULERl =    0.5772156649015328606065120900824024L;  /* euler constant*/
+constexpr long double CONST_SQRT2l =    1.4142135623730950488016887242096981L;  /* sqrt(2) */
+constexpr long double CONST_SQRT1_2l =  0.7071067811865475244008443621048490L;  /* 1/sqrt(2) */
+constexpr long double CONST_SQRT3l =    1.7320508075688772935274463415058724L;  /* sqrt(3) */
+constexpr long double CONST_EULERl =    0.5772156649015328606065120900824024L;  /* euler constant*/
 
 #endif