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

[subset] Conditionalize call to hb_font_set_variations

This commit is contained in:
Behdad Esfahbod 2022-12-04 15:31:47 -07:00
parent ad5588e800
commit aa7f5e3742
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OT/glyf/glyf.hh
View File

@ -435,7 +435,9 @@ glyf::_create_font_for_instancing (const hb_subset_plan_t *plan) const
vars.push (var); vars.push (var);
} }
#ifndef HB_NO_VAR
hb_font_set_variations (font, vars.arrayZ, plan->user_axes_location->get_population ()); hb_font_set_variations (font, vars.arrayZ, plan->user_axes_location->get_population ());
#endif
return font; return font;
} }

40
src/harfbuzz-subset.cc
View File

@ -1,51 +1,13 @@
#include "graph/gsubgpos-context.cc"
#include "hb-aat-layout.cc"
#include "hb-aat-map.cc"
#include "hb-blob.cc" #include "hb-blob.cc"
#include "hb-buffer-serialize.cc"
#include "hb-buffer-verify.cc"
#include "hb-buffer.cc"
#include "hb-common.cc"
#include "hb-draw.cc"
#include "hb-face.cc" #include "hb-face.cc"
#include "hb-fallback-shape.cc"
#include "hb-font.cc" #include "hb-font.cc"
#include "hb-map.cc" #include "hb-map.cc"
#include "hb-number.cc" #include "hb-number.cc"
#include "hb-ot-cff1-table.cc" #include "hb-ot-cff1-table.cc"
#include "hb-ot-cff2-table.cc" #include "hb-ot-cff2-table.cc"
#include "hb-ot-color.cc"
#include "hb-ot-face.cc"
#include "hb-ot-font.cc" #include "hb-ot-font.cc"
#include "hb-ot-layout.cc"
#include "hb-ot-map.cc"
#include "hb-ot-math.cc"
#include "hb-ot-meta.cc"
#include "hb-ot-metrics.cc"
#include "hb-ot-name.cc"
#include "hb-ot-shape-fallback.cc"
#include "hb-ot-shape-normalize.cc"
#include "hb-ot-shape.cc"
#include "hb-ot-shaper-arabic.cc"
#include "hb-ot-shaper-default.cc"
#include "hb-ot-shaper-hangul.cc"
#include "hb-ot-shaper-hebrew.cc"
#include "hb-ot-shaper-indic-table.cc"
#include "hb-ot-shaper-indic.cc"
#include "hb-ot-shaper-khmer.cc"
#include "hb-ot-shaper-myanmar.cc"
#include "hb-ot-shaper-syllabic.cc"
#include "hb-ot-shaper-thai.cc"
#include "hb-ot-shaper-use.cc"
#include "hb-ot-shaper-vowel-constraints.cc"
#include "hb-ot-tag.cc"
#include "hb-ot-var.cc"
#include "hb-set.cc" #include "hb-set.cc"
#include "hb-shape-plan.cc"
#include "hb-shape.cc"
#include "hb-shaper.cc"
#include "hb-static.cc" #include "hb-static.cc"
#include "hb-style.cc"
#include "hb-subset-cff-common.cc" #include "hb-subset-cff-common.cc"
#include "hb-subset-cff1.cc" #include "hb-subset-cff1.cc"
#include "hb-subset-cff2.cc" #include "hb-subset-cff2.cc"
@ -53,5 +15,3 @@
#include "hb-subset-plan.cc" #include "hb-subset-plan.cc"
#include "hb-subset-repacker.cc" #include "hb-subset-repacker.cc"
#include "hb-subset.cc" #include "hb-subset.cc"
#include "hb-ucd.cc"
#include "hb-unicode.cc"

2
src/hb-subset-plan.cc
View File

@ -345,7 +345,9 @@ _get_hb_font_with_variations (const hb_subset_plan_t *plan)
vars.push (var); vars.push (var);
} }
#ifndef HB_NO_VAR
hb_font_set_variations (font, vars.arrayZ, plan->user_axes_location->get_population ()); hb_font_set_variations (font, vars.arrayZ, plan->user_axes_location->get_population ());
#endif
return font; return font;
} }