Commit bd837a0
committed
Fix matplotlib#4230: Don't overflow buffer with sketch path.
There's no good way to estimate the length of the string when
sketch is turned on, so I've just bitten the bullet and made
the string dynamically reallocatable after all. It's a bit of
a performance regression in that there is always a string copy
upon creating the Python string object, but at least now this
should work for arbitrary path transformations.1 parent daa51ca commit bd837a0
7 files changed
Lines changed: 12230 additions & 42 deletions
File tree
- lib/matplotlib
- backends
- tests
- baseline_images/test_path
- src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -540,21 +540,23 @@ def option_image_nocomposite(self): | |||
| 540 | 540 | else: | |
| 541 | 541 | return not rcParams['image.composite_image'] | |
| 542 | 542 | ||
| 543 | - def _convert_path(self, path, transform=None, clip=None, simplify=None): | ||
| 543 | + def _convert_path(self, path, transform=None, clip=None, simplify=None, | ||
| 544 | + sketch=None): | ||
| 544 | 545 | if clip: | |
| 545 | 546 | clip = (0.0, 0.0, self.width, self.height) | |
| 546 | 547 | else: | |
| 547 | 548 | clip = None | |
| 548 | 549 | return _path.convert_to_string( | |
| 549 | - path, transform, clip, simplify, None, 6, | ||
| 550 | + path, transform, clip, simplify, sketch, 6, | ||
| 550 | 551 | [b'M', b'L', b'Q', b'C', b'z'], False).decode('ascii') | |
| 551 | 552 | ||
| 552 | 553 | def draw_path(self, gc, path, transform, rgbFace=None): | |
| 553 | 554 | trans_and_flip = self._make_flip_transform(transform) | |
| 554 | 555 | clip = (rgbFace is None and gc.get_hatch_path() is None) | |
| 555 | 556 | simplify = path.should_simplify and clip | |
| 556 | 557 | path_data = self._convert_path( | |
| 557 | - path, trans_and_flip, clip=clip, simplify=simplify) | ||
| 558 | + path, trans_and_flip, clip=clip, simplify=simplify, | ||
| 559 | + sketch=gc.get_sketch_params()) | ||
| 558 | 560 | ||
| 559 | 561 | attrib = {} | |
| 560 | 562 | attrib['style'] = self._get_style(gc, rgbFace) | |
Binary file not shown.
LoadingViewer requires iframe.
0 commit comments