zcy
/
svgpathtoolss
mirror of https://github.com/mathandy/svgpathtools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

suppress unneeded numpy warnings from QuadraticBezier.length()

security-update
Andrew Port 2021-09-21 01:39:25 -07:00
parent 4f615f9a9d
commit 11682a3363
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
svgpathtools/path.py
View File

@ -914,6 +914,7 @@ class QuadraticBezier(object):
if t0 == 1 and t1 == 0: if t0 == 1 and t1 == 0:
if self._length_info['bpoints'] == self.bpoints(): if self._length_info['bpoints'] == self.bpoints():
return self._length_info['length'] return self._length_info['length']
a = self.start - 2*self.control + self.end a = self.start - 2*self.control + self.end
b = 2*(self.control - self.start) b = 2*(self.control - self.start)
a_dot_b = a.real*b.real + a.imag*b.imag a_dot_b = a.real*b.real + a.imag*b.imag
@ -921,20 +922,23 @@ class QuadraticBezier(object):
if abs(a) < 1e-12: if abs(a) < 1e-12:
s = abs(b)*(t1 - t0) s = abs(b)*(t1 - t0)
else: else:
c2 = 4 * (a.real ** 2 + a.imag ** 2) with np.testing.suppress_warnings() as sup:
c1 = 4 * a_dot_b sup.filter(RuntimeWarning)
c0 = b.real ** 2 + b.imag ** 2 c2 = 4 * (a.real ** 2 + a.imag ** 2)
c1 = 4 * a_dot_b
c0 = b.real ** 2 + b.imag ** 2
beta = c1 / (2 * c2) beta = c1 / (2 * c2)
gamma = c0 / c2 - beta ** 2 gamma = c0 / c2 - beta ** 2
dq1_mag = sqrt(c2 * t1 ** 2 + c1 * t1 + c0)
dq0_mag = sqrt(c2 * t0 ** 2 + c1 * t0 + c0)
logarand = (sqrt(c2) * (t1 + beta) + dq1_mag) / \
(sqrt(c2) * (t0 + beta) + dq0_mag)
s = (t1 + beta) * dq1_mag - (t0 + beta) * dq0_mag + \
gamma * sqrt(c2) * log(logarand)
s /= 2
dq1_mag = sqrt(c2 * t1 ** 2 + c1 * t1 + c0)
dq0_mag = sqrt(c2 * t0 ** 2 + c1 * t0 + c0)
logarand = (sqrt(c2) * (t1 + beta) + dq1_mag) / \
(sqrt(c2) * (t0 + beta) + dq0_mag)
s = (t1 + beta) * dq1_mag - (t0 + beta) * dq0_mag + \
gamma * sqrt(c2) * log(logarand)
s /= 2
if isnan(s): if isnan(s):
tstar = abs(b) / (2 * abs(a)) tstar = abs(b) / (2 * abs(a))
if t1 < tstar: if t1 < tstar: