archive/inter-font
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for upgraded numpy

Browse source
This commit is contained in:
Rasmus Andersson 2018-08-28 10:20:37 -07:00
parent 18ba0aee6a
commit ed08f44b42
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
misc/pylib/fontbuild/curveFitPen.pyx
View file

@ -339,7 +339,7 @@ def fitBezierSimple(pts):
T = T.dot(M) T = T.dot(M)
T = np.concatenate((T, np.array([[100,0,0,0], [0,0,0,100]]))) T = np.concatenate((T, np.array([[100,0,0,0], [0,0,0,100]])))
# pts = np.vstack((pts, pts[0] * 100, pts[-1] * 100)) # pts = np.vstack((pts, pts[0] * 100, pts[-1] * 100))
C = np.linalg.lstsq(T, pts) C = np.linalg.lstsq(T, pts, rcond=-1)
return C[0] return C[0]
@ -388,7 +388,7 @@ def fitBezier(pts, tangent0=None, tangent3=None):
]) ])
TT = np.concatenate((TT, tangentConstraintsT * 1000)) TT = np.concatenate((TT, tangentConstraintsT * 1000))
pout = np.concatenate((pout, tangentConstraintsP * 1000)) pout = np.concatenate((pout, tangentConstraintsP * 1000))
C = np.linalg.lstsq(TT,pout)[0].reshape((2,2)) C = np.linalg.lstsq(TT,pout)[0].reshape((2,2), rcond=-1)
return np.array([pts[0], C[0], C[1], pts[-1]]) return np.array([pts[0], C[0], C[1], pts[-1]])