Skip to content

Commit 7af1df6

Browse files
committed
Revert "Merge branch 'main' into HVF"
This reverts commit 3a64fce, reversing changes made to f63d960.
1 parent 57565de commit 7af1df6

File tree

10 files changed

+0
-1390
lines changed

10 files changed

+0
-1390
lines changed

src/OT/Var/VARC/VARC.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,6 @@ VARC::get_path_at (const hb_varc_context_t &c,
357357
hb_draw_session_t transformer_session {transformer_funcs, &context};
358358
hb_draw_session_t &shape_draw_session = transform.is_identity () ? *c.draw_session : transformer_session;
359359

360-
#ifndef HB_NO_VAR_HVF
361-
if (c.font->face->table.hvgl->get_path_at (c.font, glyph, shape_draw_session, coords)) return true;
362-
#endif
363360
if (c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch)) return true;
364361
#ifndef HB_NO_CFF
365362
if (c.font->face->table.cff2->get_path_at (c.font, glyph, shape_draw_session, coords)) return true;

src/OT/Var/VARC/VARC.hh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "../../../hb-decycler.hh"
55
#include "../../../hb-geometry.hh"
6-
#include "../../../hb-aat-var-hvgl-table.hh"
76
#include "../../../hb-ot-layout-common.hh"
87
#include "../../../hb-ot-glyf-table.hh"
98
#include "../../../hb-ot-cff2-table.hh"

src/harfbuzz-subset.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "graph/gsubgpos-context.cc"
33
#include "hb-aat-layout.cc"
44
#include "hb-aat-map.cc"
5-
#include "hb-aat-var-hvgl-table.cc"
65
#include "hb-blob.cc"
76
#include "hb-buffer-serialize.cc"
87
#include "hb-buffer-verify.cc"

src/harfbuzz.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "OT/Var/VARC/VARC.cc"
22
#include "hb-aat-layout.cc"
33
#include "hb-aat-map.cc"
4-
#include "hb-aat-var-hvgl-table.cc"
54
#include "hb-blob.cc"
65
#include "hb-buffer-serialize.cc"
76
#include "hb-buffer-verify.cc"

0 commit comments

Comments
 (0)