From 821ea7385f850cdcc0b4ab24bfc144578919e2de Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 20 Feb 2017 17:19:20 -0600 Subject: [PATCH] Minor --- Lib/fontTools/pens/momentsPen.py | 3 +-- Lib/fontTools/pens/perimeterPen.py | 10 +++++----- Snippets/symfont.py | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Lib/fontTools/pens/momentsPen.py b/Lib/fontTools/pens/momentsPen.py index 4eeb286a3..938fe1c29 100644 --- a/Lib/fontTools/pens/momentsPen.py +++ b/Lib/fontTools/pens/momentsPen.py @@ -20,8 +20,7 @@ class MomentsPen(BasePen): def _closePath(self): p0 = self._getCurrentPoint() if p0 != self.__startPoint: - p1 = self.__startPoint - self._lineTo(p1) + self._lineTo(self.__startPoint) def _lineTo(self, p1): x0,y0 = self._getCurrentPoint() diff --git a/Lib/fontTools/pens/perimeterPen.py b/Lib/fontTools/pens/perimeterPen.py index 41ada0524..7137f2bf0 100644 --- a/Lib/fontTools/pens/perimeterPen.py +++ b/Lib/fontTools/pens/perimeterPen.py @@ -39,6 +39,11 @@ class PerimeterPen(BasePen): def _moveTo(self, p0): self.__startPoint = p0 + def _closePath(self): + p0 = self._getCurrentPoint() + if p0 != self.__startPoint: + self._lineTo(self.__startPoint) + def _lineTo(self, p1): p0 = self._getCurrentPoint() self.value += _distance(p0, p1) @@ -120,8 +125,3 @@ class PerimeterPen(BasePen): def _curveToOne(self, p1, p2, p3): p0 = self._getCurrentPoint() self._addCubic(complex(*p0), complex(*p1), complex(*p2), complex(*p3)) - - def _closePath(self): - p0 = self._getCurrentPoint() - if p0 != self.__startPoint: - self.value += _distance(p0, self.__startPoint) diff --git a/Snippets/symfont.py b/Snippets/symfont.py index 106520d97..be45996da 100755 --- a/Snippets/symfont.py +++ b/Snippets/symfont.py @@ -66,8 +66,7 @@ class %s(BasePen): def _closePath(self): p0 = self._getCurrentPoint() if p0 != self.__startPoint: - p1 = self.__startPoint - self._lineTo(p1)''', file=file) + self._lineTo(self.__startPoint)''', file=file) for n in (1, 2, 3):