[Numpy-svn] r2986 - trunk/numpy/core

[numpy-svn at scipy.org]

Author: oliphant
Date: 2006-08-10 08:37:43 -0500 (Thu, 10 Aug 2006)
New Revision: 2986

Modified:
   trunk/numpy/core/ma.py
Log:
Don't use masked output values for output array

Modified: trunk/numpy/core/ma.py
===================================================================
--- trunk/numpy/core/ma.py	2006-08-10 13:33:45 UTC (rev 2985)
+++ trunk/numpy/core/ma.py	2006-08-10 13:37:43 UTC (rev 2986)
@@ -1947,8 +1947,8 @@
     c = filled(condition, 0)
     m = getmask(x)
     if m is not nomask:
-        m = numeric.compress(c, m, dimension, out)
-    d = numeric.compress(c, filled(x), dimension, m)
+        m = numeric.compress(c, m, dimension)
+    d = numeric.compress(c, filled(x), dimension)
     return masked_array(d, m)
 
 class _minimum_operation:
@@ -2081,7 +2081,7 @@
     """trace(a,offset=0, axis1=0, axis2=1) returns the sum along diagonals
     (defined by the last two dimenions) of the array.
     """
-    return diagonal(a, offset, axis1, axis2).sum(dtype=dtype, out=out)
+    return diagonal(a, offset, axis1, axis2).sum(dtype=dtype)
 
 def argsort (x, axis = -1, out=None, fill_value=None):
     """Treating masked values as if they have the value fill_value,