Merge pull request #4250 from efiring/quiver_copy

tacaswell · tacaswell · commit 166e9ccfe01e · 2015-03-21T17:48:57.000-04:00
BUG : Quiver must copy U, V, C args so they can't change before draw()
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -529,11 +529,13 @@ def draw(self, renderer):
         mcollections.PolyCollection.draw(self, renderer)
 
     def set_UVC(self, U, V, C=None):
-        U = ma.masked_invalid(U, copy=False).ravel()
-        V = ma.masked_invalid(V, copy=False).ravel()
+        # We need to ensure we have a copy, not a reference
+        # to an array that might change before draw().
+        U = ma.masked_invalid(U, copy=True).ravel()
+        V = ma.masked_invalid(V, copy=True).ravel()
         mask = ma.mask_or(U.mask, V.mask, copy=False, shrink=True)
         if C is not None:
-            C = ma.masked_invalid(C, copy=False).ravel()
+            C = ma.masked_invalid(C, copy=True).ravel()
             mask = ma.mask_or(mask, C.mask, copy=False, shrink=True)
             if mask is ma.nomask:
                 C = C.filled()
diff --git a/lib/matplotlib/tests/test_quiver.py b/lib/matplotlib/tests/test_quiver.py
@@ -83,6 +83,15 @@ def test_quiver_single():
     ax.quiver([1], [1], [2], [2])
 
 
+@cleanup
+def test_quiver_copy():
+    fig, ax = plt.subplots()
+    uv = dict(u=np.array([1.1]), v=np.array([2.0]))
+    q0 = ax.quiver([1], [1], uv['u'], uv['v'])
+    uv['v'][0] = 0
+    assert q0.V[0] == 2.0
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule()
