shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we swapped the segments, we must swap them back when returning results

Browse Source
This commit is contained in:
Simon Cozens 2021-02-18 22:12:20 +00:00
parent 1795ee98b2
commit 2ef7964e90
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/fontTools/misc/bezierTools.py
View File

@ -1137,16 +1137,22 @@ def segmentSegmentIntersections(seg1, seg2):
""" """
# Arrange by degree # Arrange by degree
swapped = False
if len(seg2) > len(seg1): if len(seg2) > len(seg1):
seg2, seg1 = seg1, seg2 seg2, seg1 = seg1, seg2
swapped = True
if len(seg1) > 2: if len(seg1) > 2:
if len(seg2) > 2: if len(seg2) > 2:
return curveCurveIntersections(seg1, seg2) intersections = curveCurveIntersections(seg1, seg2)
else: else:
return curveLineIntersections(seg1, seg2) intersections = curveLineIntersections(seg1, seg2)
elif len(seg1) == 2 and len(seg2) == 2: elif len(seg1) == 2 and len(seg2) == 2:
return lineLineIntersections(*seg1, *seg2) intersections = lineLineIntersections(*seg1, *seg2)
else:
raise ValueError("Couldn't work out which intersection function to use") raise ValueError("Couldn't work out which intersection function to use")
if not swapped:
return intersections
return [Intersection(pt=i.pt, t1=i.t2, t2=i.t1) for i in intersections]
def _segmentrepr(obj): def _segmentrepr(obj):