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

[interpolatable] Use math.sqrt()

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-04-22 14:09:45 -06:00
parent 7fd3f7632e
commit b5899772c7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/varLib/interpolatable.py
View File

@ -12,6 +12,7 @@ from fontTools.pens.recordingPen import RecordingPen
from fontTools.pens.statisticsPen import StatisticsPen from fontTools.pens.statisticsPen import StatisticsPen
from fontTools.pens.momentsPen import OpenContourError from fontTools.pens.momentsPen import OpenContourError
from collections import OrderedDict from collections import OrderedDict
import math
import itertools import itertools
import sys import sys
@ -138,7 +139,6 @@ def min_cost_perfect_bipartite_matching(G):
def test(glyphsets, glyphs=None, names=None, ignore_missing=False): def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
if names is None: if names is None:
names = glyphsets names = glyphsets
if glyphs is None: if glyphs is None:
@ -159,7 +159,6 @@ def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
allNodeTypes = [] allNodeTypes = []
allContourIsomorphisms = [] allContourIsomorphisms = []
for glyphset, name in zip(glyphsets, names): for glyphset, name in zip(glyphsets, names):
glyph = glyphset[glyph_name] glyph = glyphset[glyph_name]
if glyph is None: if glyph is None:
@ -187,7 +186,6 @@ def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
allVectors.append(contourVectors) allVectors.append(contourVectors)
allContourIsomorphisms.append(contourIsomorphisms) allContourIsomorphisms.append(contourIsomorphisms)
for ix, contour in enumerate(contourPens): for ix, contour in enumerate(contourPens):
nodeVecs = tuple(instruction[0] for instruction in contour.value) nodeVecs = tuple(instruction[0] for instruction in contour.value)
nodeTypes.append(nodeVecs) nodeTypes.append(nodeVecs)
@ -200,7 +198,7 @@ def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
{"master": name, "contour": ix, "type": "open_path"}, {"master": name, "contour": ix, "type": "open_path"},
) )
continue continue
size = abs(stats.area) ** 0.5 * 0.5 size = math.sqrt(abs(stats.area)) * 0.5
vector = ( vector = (
int(size), int(size),
int(stats.meanX), int(stats.meanX),