walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix macro-in-macro invocation 

../src/hb-ot-color-colr-table.hh:980:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive]
\#if COLRV1_ENABLE_SUBSETTING == 1
This commit is contained in:
Behdad Esfahbod 2021-07-28 11:53:06 -06:00
parent 087e2705de
commit cc3a7ceea3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hb-ot-color-colr-table.hh
View File

@ -977,14 +977,11 @@ struct COLR
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
(this+baseGlyphsZ).sanitize (c, numBaseGlyphs) && (this+baseGlyphsZ).sanitize (c, numBaseGlyphs) &&
(this+layersZ).sanitize (c, numLayers) && (this+layersZ).sanitize (c, numLayers) &&
#if COLRV1_ENABLE_SUBSETTING == 1 (version == 0 ||
(version == 0 || (version == 1 && (COLRV1_ENABLE_SUBSETTING && version == 1 &&
baseGlyphsV1List.sanitize (c, this) && baseGlyphsV1List.sanitize (c, this) &&
layersV1.sanitize (c, this) && layersV1.sanitize (c, this) &&
varStore.sanitize (c, this)))); varStore.sanitize (c, this))));
#else
(version == 0));
#endif
} }
template<typename BaseIterator, typename LayerIterator, template<typename BaseIterator, typename LayerIterator,