diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-04-12 13:40:20 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-04-12 13:40:20 +0200 |
commit | 1fd194fb757480a11ebd877e17dd627c90d76dd1 (patch) | |
tree | 9ad22d95dd8673bc036d14b0055a8dcd6febe09e /math/s_cprojf.c | |
parent | 4ac4e460b116fb6da6e80124f4c4f6968eb86341 (diff) | |
parent | ea42a20caed5b343ff20a0d4622ae6c17b77161b (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'math/s_cprojf.c')
-rw-r--r-- | math/s_cprojf.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/math/s_cprojf.c b/math/s_cprojf.c index 83df13cfa9..e7eacafbaf 100644 --- a/math/s_cprojf.c +++ b/math/s_cprojf.c @@ -1,5 +1,5 @@ /* Compute projection of complex float value to Riemann sphere. - Copyright (C) 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -25,24 +25,19 @@ __complex__ float __cprojf (__complex__ float x) { - __complex__ float res; - if (isnan (__real__ x) && isnan (__imag__ x)) return x; else if (!isfinite (__real__ x) || !isfinite (__imag__ x)) { + __complex__ float res; + __real__ res = INFINITY; __imag__ res = __copysignf (0.0, __imag__ x); - } - else - { - float den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0; - __real__ res = (2.0 * __real__ x) / den; - __imag__ res = (2.0 * __imag__ x) / den; + return res; } - return res; + return x; } #ifndef __cprojf weak_alias (__cprojf, cprojf) |