[Libreoffice-commits] core.git: connectivity/source

Takeshi Abe tabe at fixedpoint.jp
Tue Feb 3 22:38:15 PST 2015


 connectivity/source/drivers/file/FNumericFunctions.cxx |    8 +++++---
 connectivity/source/inc/file/FNumericFunctions.hxx     |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 99c00b090533da9818444be2831b8da0e713e5f9
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Feb 3 19:16:16 2015 +0900

    Fix a little bit creative pi value
    
    Change-Id: I09802fc799a892c322d8b69f16995b2f99da1f9c

diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 9971064..b749c3f 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -25,6 +25,8 @@
 using namespace connectivity;
 using namespace connectivity::file;
 
+static const double fPi = 3.14159265358979323846;
+
 ORowSetValue OOp_Abs::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -160,7 +162,7 @@ ORowSetValue OOp_Sqrt::operate(const ORowSetValue& lhs) const
 
 ORowSetValue OOp_Pi::operate(const ::std::vector<ORowSetValue>& /*lhs*/) const
 {
-    return 3.141592653589793116;
+    return fPi;
 }
 
 ORowSetValue OOp_Cos::operate(const ORowSetValue& lhs) const
@@ -225,7 +227,7 @@ ORowSetValue OOp_Degrees::operate(const ORowSetValue& lhs) const
         return lhs;
 
     double nLhs = lhs;
-    return nLhs*180*(1.0/3.141592653589793116);
+    return nLhs*180*(1.0/fPi);
 }
 
 ORowSetValue OOp_Radians::operate(const ORowSetValue& lhs) const
@@ -234,7 +236,7 @@ ORowSetValue OOp_Radians::operate(const ORowSetValue& lhs) const
         return lhs;
 
     double nLhs = lhs;
-    return nLhs*3.141592653589793116*(1.0/180.0);
+    return nLhs*fPi*(1.0/180.0);
 }
 
 
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index 8b80c6b..a8a5267 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -232,7 +232,7 @@ namespace connectivity
         > SELECT PI();
                 -> 3.141593
         > SELECT PI()+0.000000000000000000;
-                -> 3.141592653589793116
+                -> 3.141592653589793238
 
         */
         class OOp_Pi : public ONthOperator


More information about the Libreoffice-commits mailing list