From 3e32cd9570fd8b09901fb790b80365ae425f681a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 23 Apr 2012 13:20:52 -0400 Subject: [PATCH] Minor --- src/hb-ot-layout-gsubgpos-private.hh | 1 - src/hb-ot-layout.cc | 6 +++--- src/hb-ot-layout.h | 8 ++++++++ src/hb-private.hh | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 810a4954..46e322b5 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -31,7 +31,6 @@ #include "hb-buffer-private.hh" #include "hb-ot-layout-gdef-table.hh" -#include "hb-ot-layout-closure.h" diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index b0186610..4441a7e4 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -471,9 +471,9 @@ hb_ot_layout_substitute_finish (hb_buffer_t *buffer HB_UNUSED) } hb_bool_t -hb_ot_layout_closure_lookup (hb_face_t *face, - hb_glyph_map_t *glyphs, - unsigned int lookup_index) +hb_ot_layout_substitute_closure_lookup (hb_face_t *face, + hb_glyph_map_t *glyphs, + unsigned int lookup_index) { hb_closure_context_t c (face, glyphs); return _get_gsub (face).closure_lookup (&c, lookup_index); diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h index 430e54c3..16addc68 100644 --- a/src/hb-ot-layout.h +++ b/src/hb-ot-layout.h @@ -182,6 +182,14 @@ hb_ot_layout_substitute_lookup (hb_face_t *face, void hb_ot_layout_substitute_finish (hb_buffer_t *buffer); + +typedef uint32_t hb_glyph_map_t[65536 / 32]; /* 8kb */ + +hb_bool_t +hb_ot_layout_substitute_closure_lookup (hb_face_t *face, + hb_glyph_map_t *glyphs, + unsigned int lookup_index); + /* * GPOS */ diff --git a/src/hb-private.hh b/src/hb-private.hh index 64cb3c86..4f211a1c 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -34,9 +34,11 @@ #endif #include "hb.h" -#include "hb-ot.h" #define HB_H_IN +#ifdef HAVE_OT +#include "hb-ot.h" #define HB_OT_H_IN +#endif #include #include -- GitLab