diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 53059ba63..9ba6249bf 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -5291,6 +5291,11 @@ struct VariationDevice hb_pair_t *v; if (!layout_variation_idx_delta_map->has (varIdx, &v)) return_trace (nullptr); + /* The varidx was mapped to "no variations" during instancing (e.g. the + * instantiated row is all zeros). Drop the device instead of emitting one + * with an out-of-range varidx. */ + if (hb_first (*v) == HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + return_trace (nullptr); c->start_zerocopy (this->static_size); auto *out = c->embed (this); diff --git a/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.iup_optimize.ttf b/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.iup_optimize.ttf index b5eef2d00..7be7de238 100644 Binary files a/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.iup_optimize.ttf and b/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.iup_optimize.ttf differ diff --git a/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.ttf b/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.ttf index b7217b2dd..e5c220247 100644 Binary files a/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.ttf and b/test/subset/data/expected/empty_region_vardata/RobotoFlex-Variable.ABC.default.all.wght=200-300,opsz=14.ttf differ diff --git a/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.iup_optimize.ttf b/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.iup_optimize.ttf index 4d79c2ce2..765c9f8eb 100644 Binary files a/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.iup_optimize.ttf and b/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.iup_optimize.ttf differ diff --git a/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.ttf b/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.ttf index 97c7b1ad5..b30b75240 100644 Binary files a/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.ttf and b/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.all.wght=300.ttf differ diff --git a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.iup_optimize.ttf b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.iup_optimize.ttf index af6f380b2..44fb4ffb7 100644 Binary files a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.iup_optimize.ttf and b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.iup_optimize.ttf differ diff --git a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.ttf b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.ttf index dbd4f9363..f781cc390 100644 Binary files a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.ttf and b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=300-600.ttf differ diff --git a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.iup_optimize.ttf b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.iup_optimize.ttf index cd95969c2..739f1f4fc 100644 Binary files a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.iup_optimize.ttf and b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.iup_optimize.ttf differ diff --git a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.ttf b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.ttf index 2eba9846f..4f653e50e 100644 Binary files a/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.ttf and b/test/subset/data/expected/update_def_wght/SourceSerifVariable-Roman.default.all.wght=500-800.ttf differ diff --git a/test/subset/data/tests/gdef_partial_instance.tests b/test/subset/data/tests/gdef_partial_instance.tests index 17a3a4e0d..9650db627 100644 --- a/test/subset/data/tests/gdef_partial_instance.tests +++ b/test/subset/data/tests/gdef_partial_instance.tests @@ -13,3 +13,8 @@ wght=300 IUP_OPTIONS: Yes No + +# fonttools keeps variation devices whose instantiated delta row is all zeros +# as devices with an out-of-range varidx (0xFFFFFFFF); HarfBuzz drops them. +OPTIONS: +no_fonttools