Fix cproj implmentation.

4 files changed, 18 insertions, 34 deletions

diff --git a/math/libm-test.inc b/math/libm-test.inc
index 260d3ec665..6650b889c5 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1997.
 
@@ -2087,7 +2087,7 @@ cproj_test (void)
   TEST_c_c (cproj, minus_infty, minus_infty, plus_infty, minus_zero);
 
   TEST_c_c (cproj, 1.0, 0.0, 1.0, 0.0);
-  TEST_c_c (cproj, 2.0, 3.0, 0.2857142857142857142857142857142857L, 0.42857142857142857142857142857142855L);
+  TEST_c_c (cproj, 2.0, 3.0, 2.0, 3.0);
 
   END (cproj, complex);
 }
diff --git a/math/s_cproj.c b/math/s_cproj.c
index 8e7ca41df8..90e5ebaa4e 100644
--- a/math/s_cproj.c
+++ b/math/s_cproj.c
@@ -1,5 +1,5 @@
 /* Compute projection of complex double 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__ double
 __cproj (__complex__ double x)
 {
-  __complex__ double res;
-
   if (isnan (__real__ x) && isnan (__imag__ x))
     return x;
   else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
+      __complex__ double res;
+
       __real__ res = INFINITY;
       __imag__ res = __copysign (0.0, __imag__ x);
-    }
-  else
-    {
-      double 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;
 }
 weak_alias (__cproj, cproj)
 #ifdef NO_LONG_DOUBLE
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)
diff --git a/math/s_cprojl.c b/math/s_cprojl.c
index c70cdc47db..19c17a82bd 100644
--- a/math/s_cprojl.c
+++ b/math/s_cprojl.c
@@ -1,5 +1,5 @@
 /* Compute projection of complex long double 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,18 @@
 __complex__ long double
 __cprojl (__complex__ long double x)
 {
-  __complex__ long double res;
-
   if (isnan (__real__ x) && isnan (__imag__ x))
     return x;
   else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
+      __complex__ long double res;
+
       __real__ res = INFINITY;
       __imag__ res = __copysignl (0.0, __imag__ x);
-    }
-  else
-    {
-      long double 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;
 }
 weak_alias (__cprojl, cprojl)