Merge pull request #4578 from harfbuzz/varc-table

`VARC` table
harfbuzz · May 24, 2024 · 0037ee2 · 0037ee2
2 parents bc90b29 + fecc578
commit 0037ee2
Show file tree

Hide file tree

Showing 41 changed files with 2,703 additions and 1,452 deletions.
diff --git a/src/Makefile.sources b/src/Makefile.sources
@@ -40,6 +40,7 @@ HB_BASE_sources = \
 	hb-dispatch.hh \
 	hb-draw.cc \
 	hb-draw.hh \
+	hb-geometry.hh \
 	hb-face.cc \
 	hb-face.hh \
 	hb-face-builder.cc \
@@ -104,10 +105,8 @@ HB_BASE_sources = \
 	OT/glyf/Glyph.hh \
 	OT/glyf/GlyphHeader.hh \
 	OT/glyf/SimpleGlyph.hh \
-	OT/glyf/coord-setter.hh \
 	OT/glyf/composite-iter.hh \
 	OT/glyf/CompositeGlyph.hh \
-	OT/glyf/VarCompositeGlyph.hh \
 	OT/glyf/SubsetGlyph.hh \
 	OT/Layout/types.hh \
 	OT/Layout/Common/Coverage.hh \
@@ -170,6 +169,9 @@ HB_BASE_sources = \
 	OT/Layout/GSUB/SubstLookup.hh \
 	OT/Layout/GSUB/SubstLookupSubTable.hh \
 	OT/name/name.hh \
+	OT/Var/VARC/coord-setter.hh \
+	OT/Var/VARC/VARC.cc \
+	OT/Var/VARC/VARC.hh \
 	hb-ot-layout-gsubgpos.hh \
 	hb-ot-layout-jstf-table.hh \
 	hb-ot-layout.cc \
@@ -230,6 +232,7 @@ HB_BASE_sources = \
 	hb-ot-var-gvar-table.hh \
 	hb-ot-var-hvar-table.hh \
 	hb-ot-var-mvar-table.hh \
+	hb-ot-var-varc-table.hh \
 	hb-ot-var.cc \
 	hb-ot-vorg-table.hh \
 	hb-pool.hh \

diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh
@@ -72,7 +72,7 @@ public:
   hb_map_t current_glyphs;
   hb_map_t current_layers;
   int depth_left = HB_MAX_NESTING_LEVEL;
-  int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
+  int edge_count = HB_MAX_GRAPH_EDGE_COUNT;
 
   hb_paint_context_t (const void *base_,
 		      hb_paint_funcs_t *funcs_,
@@ -2579,10 +2579,6 @@ struct COLR
       {
         // COLRv1 glyph
 
-	ItemVarStoreInstancer instancer (&(this+varStore),
-				     &(this+varIdxMap),
-				     hb_array (font->coords, font->num_coords));
-
 	bool is_bounded = true;
 	if (clip)
 	{