do not retain any STOPs in make_compound_path

brunobeltran · brunobeltran · commit 72926b21ba67 · 2020-03-18T14:58:46.000-07:00
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -325,12 +325,11 @@ def make_compound_path_from_polys(cls, XY):
 
     @classmethod
     def make_compound_path(cls, *args):
-        """Make a compound path from a list of Path objects."""
+        """Make a compound path from a list of Path objects. Blindly removes
+        all Path.STOP control points."""
         # Handle an empty list in args (i.e. no args).
         if not args:
             return Path(np.empty([0, 2], dtype=np.float32))
-
-        # concatenate paths
         vertices = np.concatenate([x.vertices for x in args])
         codes = np.empty(len(vertices), dtype=cls.code_type)
         i = 0
@@ -341,16 +340,10 @@ def make_compound_path(cls, *args):
             else:
                 codes[i:i + len(path.codes)] = path.codes
             i += len(path.vertices)
-
-        # remove internal STOP's, replace kinal stop if present
-        last_vert = None
-        if codes.size > 0 and codes[-1] == cls.STOP:
-            last_vert = vertices[-1]
-        vertices = vertices[codes != cls.STOP, :]
-        codes = codes[codes != cls.STOP]
-        if last_vert is not None:
-            vertices = np.append(vertices, [last_vert], axis=0)
-            codes = np.append(codes, cls.STOP)
+        # remove STOP's, since internal STOPs are a bug
+        not_stop_mask = codes != cls.STOP
+        vertices = vertices[not_stop_mask, :]
+        codes = codes[not_stop_mask]
 
         return cls(vertices, codes)
 
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
@@ -151,7 +151,9 @@ def test_make_compound_path_stops():
     zero = [0, 0]
     paths = 3*[Path([zero, zero], [Path.MOVETO, Path.STOP])]
     compound_path = Path.make_compound_path(*paths)
-    assert np.sum(compound_path.codes == Path.STOP) == 1
+    # the choice to not preserve the terminal STOP is arbitrary, but
+    # documented, so we test that it is in fact respected here
+    assert np.sum(compound_path.codes == Path.STOP) == 0
 
 
 @image_comparison(['xkcd.png'], remove_text=True)
