Merge pull request #2390 from fonttools/fix-colr-composite-mode

[COLRv1] Add missing CompositeMode.PLUS
This commit is contained in:
Cosimo Lupo 2021-08-09 11:41:47 +02:00 committed by GitHub
commit 6d3bd9499f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1333,6 +1333,7 @@ class ClipList(getFormatSwitchingBaseTableClass("uint8")):
glyph = glyphOrder[glyphID] glyph = glyphOrder[glyphID]
except IndexError: except IndexError:
missingGlyphs.append(glyphID) missingGlyphs.append(glyphID)
continue
if glyph not in clips: if glyph not in clips:
clips[glyph] = copy.copy(rec.ClipBox) clips[glyph] = copy.copy(rec.ClipBox)
else: else:
@ -1480,21 +1481,22 @@ class CompositeMode(IntEnum):
SRC_ATOP = 9 SRC_ATOP = 9
DEST_ATOP = 10 DEST_ATOP = 10
XOR = 11 XOR = 11
SCREEN = 12 PLUS = 12
OVERLAY = 13 SCREEN = 13
DARKEN = 14 OVERLAY = 14
LIGHTEN = 15 DARKEN = 15
COLOR_DODGE = 16 LIGHTEN = 16
COLOR_BURN = 17 COLOR_DODGE = 17
HARD_LIGHT = 18 COLOR_BURN = 18
SOFT_LIGHT = 19 HARD_LIGHT = 19
DIFFERENCE = 20 SOFT_LIGHT = 20
EXCLUSION = 21 DIFFERENCE = 21
MULTIPLY = 22 EXCLUSION = 22
HSL_HUE = 23 MULTIPLY = 23
HSL_SATURATION = 24 HSL_HUE = 24
HSL_COLOR = 25 HSL_SATURATION = 25
HSL_LUMINOSITY = 26 HSL_COLOR = 26
HSL_LUMINOSITY = 27
class PaintFormat(IntEnum): class PaintFormat(IntEnum):