Merged revisions 7827 via svnmerge from

efiring · efiring · commit 59df05512206 · 2009-09-26T00:00:48.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7827 | efiring | 2009-09-25 13:56:14 -1000 (Fri, 25 Sep 2009) | 2 lines Fix bug in quiver handling of masked U, V ........ svn path=/trunk/matplotlib/; revision=7828
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -518,6 +518,11 @@ def _make_verts(self, U, V):
         xy = (X+Y*1j) * np.exp(1j*theta)*self.width
         xy = xy[:,:,np.newaxis]
         XY = np.concatenate((xy.real, xy.imag), axis=2)
+        if self.Umask is not ma.nomask:
+            XY = ma.array(XY)
+            XY[self.Umask] = ma.masked
+            # This might be handled more efficiently with nans, given
+            # that nans will end up in the paths anyway.
 
         return XY
 
@@ -575,10 +580,7 @@ def _h_arrows(self, length):
             tooshort = np.repeat(tooshort, 8, 1)
             np.putmask(X, tooshort, X1)
             np.putmask(Y, tooshort, Y1)
-        if self.Umask is not ma.nomask:
-            mask = np.repeat(self.Umask[:,np.newaxis], 8, 1)
-            X = ma.array(X, mask=mask, copy=False)
-            Y = ma.array(Y, mask=mask, copy=False)
+        # Mask handling is deferred to the caller, _make_verts.
         return X, Y
 
     quiver_doc = _quiver_doc
