From 1a48fc27a15fd7459c38509c07f2cec38d475394 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 14 Jun 2016 01:16:57 -0400 Subject: [PATCH] [symfont] Remove one level of function call --- Snippets/symfont.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Snippets/symfont.py b/Snippets/symfont.py index 8d1e66df1..0b2f6efaf 100755 --- a/Snippets/symfont.py +++ b/Snippets/symfont.py @@ -76,29 +76,26 @@ class GreenPen(BasePen): self._funcs = getGreenBezierFuncs(func) self.value = 0 - def _segment(self, *P): - self.value += self._funcs[len(P) - 1](P) - def _moveTo(self, p0): self.__startPoint = p0 - self._segment(p0) def _lineTo(self, p1): p0 = self._getCurrentPoint() - self._segment(p0,p1) + self.value += self._funcs[1]((p0,p1)) def _qCurveToOne(self, p1, p2): p0 = self._getCurrentPoint() - self._segment(p0,p1,p2) + self.value += self._funcs[2]((p0,p1,p2)) def _curveToOne(self, p1, p2, p3): p0 = self._getCurrentPoint() - self._segment(p0,p1,p2,p3) + self.value += self._funcs[3]((p0,p1,p2,p3)) def _closePath(self): p0 = self._getCurrentPoint() if p0 != self.__startPoint: - self._segment(p0,self.__startPoint) + p1 = self.__startPoint + self.value += self._funcs[1]((p0,p1)) AreaPen = partial(GreenPen, func=1) Moment1XPen = partial(GreenPen, func=x)