Mercurial > hg > octave-nkf
changeset 19816:844448ae53f3 gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 23 Jan 2015 15:23:09 -0500 |
parents | 709f3a77685d (current diff) 75a671fcdd73 (diff) |
children | a1d172bfcb2f |
files | |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/cruft/Faddeeva/Faddeeva.cc +++ b/liboctave/cruft/Faddeeva/Faddeeva.cc @@ -139,6 +139,7 @@ slight accuracy improvements to erf and dawson functions near the origin. Use gnulib functions if GNULIB_NAMESPACE is defined. + 18 December 2012: Slight tweaks (remove recomputation of x*x in Dawson) */ ///////////////////////////////////////////////////////////////////////// @@ -210,6 +211,7 @@ // the Octave developers prefer that we silence the warning. # ifdef GNULIB_NAMESPACE # define floor GNULIB_NAMESPACE::floor +# define log GNULIB_NAMESPACE::log # endif #else // !__cplusplus, i.e. pure C (requires C99 features) @@ -584,7 +586,7 @@ } else { double D = spi2 * FADDEEVA(w_im)(x); - double x2 = x*x, y2 = y*y; + double y2 = y*y; return C (D + y2 * (D + x - 2*D*x2) + y2*y2 * (D * (0.5 - x2 * (2 - 0.66666666666666666667*x2))