diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-15 15:25:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-15 15:25:48 +0100 |
| commit | 3492ad65236209e741ca3641789efeaa22a6b8a4 (patch) | |
| tree | 2db061bafcebcac423ca7deeb152435c44944419 /modules/fdlibm/src/e_atan2.cpp | |
| parent | 2057abd196545ddf8c85ab83e7d220367af8b276 (diff) | |
| parent | 59f4de4c45e126f5f20633808ce28548d5879b16 (diff) | |
| download | UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.gz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.lz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.tar.xz UXP-3492ad65236209e741ca3641789efeaa22a6b8a4.zip | |
Merge branch 'fdlibm-work'
This resolves #1291
Diffstat (limited to 'modules/fdlibm/src/e_atan2.cpp')
| -rw-r--r-- | modules/fdlibm/src/e_atan2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/fdlibm/src/e_atan2.cpp b/modules/fdlibm/src/e_atan2.cpp index 9990072cf..f45ad187f 100644 --- a/modules/fdlibm/src/e_atan2.cpp +++ b/modules/fdlibm/src/e_atan2.cpp @@ -69,8 +69,8 @@ __ieee754_atan2(double y, double x) iy = hy&0x7fffffff; if(((ix|((lx|-lx)>>31))>0x7ff00000)|| ((iy|((ly|-ly)>>31))>0x7ff00000)) /* x or y is NaN */ - return x+y; - if((hx-0x3ff00000|lx)==0) return atan(y); /* x=1.0 */ + return nan_mix(x, y); + if(hx==0x3ff00000&&lx==0) return atan(y); /* x=1.0 */ m = ((hy>>31)&1)|((hx>>30)&2); /* 2*sign(x)+sign(y) */ /* when y = 0 */ |