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

Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup() 

To match upcoming API.
This commit is contained in:
Behdad Esfahbod 2012-11-15 14:57:31 -08:00
parent a4bef84e37
commit 362a990b22
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-layout-private.hh
View File

@ -138,7 +138,7 @@ static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) {
HB_INTERNAL hb_bool_t HB_INTERNAL hb_bool_t
hb_ot_layout_would_substitute_lookup_fast (hb_face_t *face, hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
const hb_codepoint_t *glyphs, const hb_codepoint_t *glyphs,
unsigned int glyphs_length, unsigned int glyphs_length,

8
src/hb-ot-layout.cc
View File

@ -399,18 +399,18 @@ hb_ot_layout_has_substitution (hb_face_t *face)
} }
hb_bool_t hb_bool_t
hb_ot_layout_would_substitute_lookup (hb_face_t *face, hb_ot_layout_lookup_would_substitute (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
const hb_codepoint_t *glyphs, const hb_codepoint_t *glyphs,
unsigned int glyphs_length, unsigned int glyphs_length,
hb_bool_t zero_context) hb_bool_t zero_context)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false; if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false;
return hb_ot_layout_would_substitute_lookup_fast (face, lookup_index, glyphs, glyphs_length, zero_context); return hb_ot_layout_lookup_would_substitute_fast (face, lookup_index, glyphs, glyphs_length, zero_context);
} }
hb_bool_t hb_bool_t
hb_ot_layout_would_substitute_lookup_fast (hb_face_t *face, hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
const hb_codepoint_t *glyphs, const hb_codepoint_t *glyphs,
unsigned int glyphs_length, unsigned int glyphs_length,
@ -452,7 +452,7 @@ hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer)
} }
void void
hb_ot_layout_substitute_closure_lookup (hb_face_t *face, hb_ot_layout_lookup_substitute_closure (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
hb_set_t *glyphs) hb_set_t *glyphs)
{ {

4
src/hb-ot-layout.h
View File

@ -170,14 +170,14 @@ hb_bool_t
hb_ot_layout_has_substitution (hb_face_t *face); hb_ot_layout_has_substitution (hb_face_t *face);
hb_bool_t hb_bool_t
hb_ot_layout_would_substitute_lookup (hb_face_t *face, hb_ot_layout_lookup_would_substitute (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
const hb_codepoint_t *glyphs, const hb_codepoint_t *glyphs,
unsigned int glyphs_length, unsigned int glyphs_length,
hb_bool_t zero_context); hb_bool_t zero_context);
void void
hb_ot_layout_substitute_closure_lookup (hb_face_t *face, hb_ot_layout_lookup_substitute_closure (hb_face_t *face,
unsigned int lookup_index, unsigned int lookup_index,
hb_set_t *glyphs); hb_set_t *glyphs);

2
src/hb-ot-map.cc
View File

@ -142,7 +142,7 @@ void hb_ot_map_t::substitute_closure (const hb_ot_shape_plan_t *plan, hb_face_t
{ {
unsigned int table_index = 0; unsigned int table_index = 0;
for (unsigned int i = 0; i < lookups[table_index].len; i++) for (unsigned int i = 0; i < lookups[table_index].len; i++)
hb_ot_layout_substitute_closure_lookup (face, lookups[table_index][i].index, glyphs); hb_ot_layout_lookup_substitute_closure (face, lookups[table_index][i].index, glyphs);
} }
void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func) void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func)

2
src/hb-ot-shape-complex-indic.cc
View File

@ -269,7 +269,7 @@ struct would_substitute_feature_t
hb_face_t *face) const hb_face_t *face) const
{ {
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
if (hb_ot_layout_would_substitute_lookup_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context))
return true; return true;
return false; return false;
} }

2
src/test-would-substitute.cc
View File

@ -99,5 +99,5 @@ main (int argc, char **argv)
(argc > 4 && (argc > 4 &&
!hb_font_glyph_from_string (font, argv[4], -1, &glyphs[1]))) !hb_font_glyph_from_string (font, argv[4], -1, &glyphs[1])))
return 2; return 2;
return !hb_ot_layout_would_substitute_lookup (face, strtol (argv[2], NULL, 0), glyphs, len, false); return !hb_ot_layout_lookup_would_substitute (face, strtol (argv[2], NULL, 0), glyphs, len, false);
} }