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

Change case of LayerCollector fields per comment

Browse Source
This commit is contained in:
rsheeter 2020-11-04 18:47:16 -08:00
parent f531038bf9
commit 9698c71198
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Lib/fontTools/colorLib/builder.py
View File

@ -469,19 +469,19 @@ def _reuse_ranges(num_layers: int) -> Generator[Tuple[int, int], None, None]:
class LayerCollector: class LayerCollector:
Slices: List[ot.Paint] slices: List[ot.Paint]
Layers: List[ot.Paint] layers: List[ot.Paint]
ReusePool: Mapping[Tuple[Any, ...], int] reusePool: Mapping[Tuple[Any, ...], int]
def __init__(self): def __init__(self):
self.Slices = [] self.slices = []
self.Layers = [] self.layers = []
self.ReusePool = {} self.reusePool = {}
def buildColrLayers(self, paints: List[_PaintInput]) -> ot.Paint: def buildColrLayers(self, paints: List[_PaintInput]) -> ot.Paint:
paint = ot.Paint() paint = ot.Paint()
paint.Format = int(ot.Paint.Format.PaintColrLayers) paint.Format = int(ot.Paint.Format.PaintColrLayers)
self.Slices.append(paint) self.slices.append(paint)
paints = [self.build(p) for p in paints] paints = [self.build(p) for p in paints]
@ -494,7 +494,7 @@ class LayerCollector:
key=lambda t: (t[1] - t[0], t[1], t[0]), key=lambda t: (t[1] - t[0], t[1], t[0]),
reverse=True) reverse=True)
for lbound, ubound in ranges: for lbound, ubound in ranges:
reuse_lbound = self.ReusePool.get(_as_tuple(paints[lbound:ubound]), -1) reuse_lbound = self.reusePool.get(_as_tuple(paints[lbound:ubound]), -1)
if reuse_lbound == -1: if reuse_lbound == -1:
continue continue
found_reuse = True found_reuse = True
@ -505,12 +505,12 @@ class LayerCollector:
paints = paints[:lbound] + [new_slice] + paints[ubound:] paints = paints[:lbound] + [new_slice] + paints[ubound:]
paint.NumLayers = len(paints) paint.NumLayers = len(paints)
paint.FirstLayerIndex = len(self.Layers) paint.FirstLayerIndex = len(self.layers)
self.Layers.extend(paints) self.layers.extend(paints)
# Register our parts for reuse # Register our parts for reuse
for lbound, ubound in _reuse_ranges(len(paints)): for lbound, ubound in _reuse_ranges(len(paints)):
self.ReusePool[_as_tuple(paints[lbound:ubound])] = lbound + paint.FirstLayerIndex self.reusePool[_as_tuple(paints[lbound:ubound])] = lbound + paint.FirstLayerIndex
return paint return paint
@ -677,8 +677,8 @@ def buildColrV1(
raise exc from next(iter(errors.values())) raise exc from next(iter(errors.values()))
layers = ot.LayerV1List() layers = ot.LayerV1List()
layers.LayerCount = len(layerCollector.Layers) layers.LayerCount = len(layerCollector.layers)
layers.Paint = layerCollector.Layers layers.Paint = layerCollector.layers
glyphs = ot.BaseGlyphV1List() glyphs = ot.BaseGlyphV1List()
glyphs.BaseGlyphCount = len(baseGlyphs) glyphs.BaseGlyphCount = len(baseGlyphs)
glyphs.BaseGlyphV1Record = baseGlyphs glyphs.BaseGlyphV1Record = baseGlyphs