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

[subset] Add implementation of cmap format 12 codepoint listing. (#988)

This commit is contained in:
Garret Rieger 2018-04-17 07:00:23 -06:00 committed by Behdad Esfahbod
parent 6771e79bcc
commit 5dadbb0fa0
3 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hb-ot-cmap-table.hh
View File

@ -204,6 +204,8 @@ struct CmapSubtableLongGroup
{ {
friend struct CmapSubtableFormat12; friend struct CmapSubtableFormat12;
friend struct CmapSubtableFormat13; friend struct CmapSubtableFormat13;
template<typename U>
friend struct CmapSubtableLongSegmented;
friend struct cmap; friend struct cmap;
int cmp (hb_codepoint_t codepoint) const int cmp (hb_codepoint_t codepoint) const
@ -276,6 +278,15 @@ struct CmapSubtableLongSegmented
return true; return true;
} }
inline void get_all_codepoints (hb_set_t *out) const
{
for (unsigned int i = 0; i < this->groups.len; i++) {
hb_set_add_range (out,
this->groups[i].startCharCode,
this->groups[i].endCharCode);
}
}
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
@ -690,7 +701,7 @@ struct cmap
break; break;
case 12: case 12:
this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>; this->get_glyph_func = get_glyph_from<OT::CmapSubtableFormat12>;
this->get_all_codepoints_func = null_get_all_codepoints_func; this->get_all_codepoints_func = get_all_codepoints_from<OT::CmapSubtableFormat12>;
break; break;
case 4: case 4:
{ {
@ -757,6 +768,14 @@ struct cmap
return typed_obj->get_glyph (codepoint, glyph); return typed_obj->get_glyph (codepoint, glyph);
} }
template <typename Type>
static inline void get_all_codepoints_from (const void *obj,
hb_set_t *out)
{
const Type *typed_obj = (const Type *) obj;
typed_obj->get_all_codepoints (out);
}
template <typename Type> template <typename Type>
static inline bool get_glyph_from_symbol (const void *obj, static inline bool get_glyph_from_symbol (const void *obj,
hb_codepoint_t codepoint, hb_codepoint_t codepoint,

BIN
test/api/fonts/Roboto-Regular.abc.format12.ttf Normal file
View File

Binary file not shown.

44
test/api/test-subset-codepoints.c
View File

@ -48,12 +48,56 @@ test_get_all_codepoints_format4 (void)
hb_face_destroy (face); hb_face_destroy (face);
} }
static void
test_get_all_codepoints_format12 (void)
{
hb_face_t *face = hb_subset_test_open_font("fonts/Roboto-Regular.abc.format12.ttf");
hb_set_t *codepoints = hb_set_create();
hb_subset_get_all_codepoints (face, codepoints);
hb_codepoint_t cp = HB_SET_VALUE_INVALID;
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x61, ==, cp);
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x62, ==, cp);
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x63, ==, cp);
g_assert (!hb_set_next (codepoints, &cp));
hb_set_destroy (codepoints);
hb_face_destroy (face);
}
static void
test_get_all_codepoints (void)
{
hb_face_t *face = hb_subset_test_open_font("fonts/Roboto-Regular.abc.ttf");
hb_set_t *codepoints = hb_set_create();
hb_subset_get_all_codepoints (face, codepoints);
hb_codepoint_t cp = HB_SET_VALUE_INVALID;
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x61, ==, cp);
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x62, ==, cp);
g_assert (hb_set_next (codepoints, &cp));
g_assert_cmpuint (0x63, ==, cp);
g_assert (!hb_set_next (codepoints, &cp));
hb_set_destroy (codepoints);
hb_face_destroy (face);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
hb_test_init (&argc, &argv); hb_test_init (&argc, &argv);
hb_test_add (test_get_all_codepoints);
hb_test_add (test_get_all_codepoints_format4); hb_test_add (test_get_all_codepoints_format4);
hb_test_add (test_get_all_codepoints_format12);
return hb_test_run(); return hb_test_run();
} }