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

[util] Change hb-subset to use face_options_t instead of font_options_t

This commit is contained in:
Behdad Esfahbod 2021-08-06 18:46:31 -06:00
parent 869e20e09f
commit 6500f68f1f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/hb-subset.cc
View File

@ -30,6 +30,7 @@
#include "main-font-text.hh" #include "main-font-text.hh"
#include "hb-subset.h" #include "hb-subset.h"
// XXX Remove eventually
const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_NONE; const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_NONE;
const unsigned SUBPIXEL_BITS = 0; const unsigned SUBPIXEL_BITS = 0;
@ -45,9 +46,9 @@ struct subset_consumer_t
subset_options.add_options (parser); subset_options.add_options (parser);
} }
void init (const font_options_t *font_opts) void init (const face_options_t *face_opts)
{ {
face = hb_face_reference (hb_font_get_face (font_opts->get_font ())); face = hb_face_reference (face_opts->get_face ());
input = hb_subset_input_reference (subset_options.get_input ()); input = hb_subset_input_reference (subset_options.get_input ());
} }
@ -98,7 +99,7 @@ struct subset_consumer_t
return true; return true;
} }
void finish (const font_options_t *font_opts) void finish (const face_options_t *face_opts)
{ {
hb_face_t *new_face = nullptr; hb_face_t *new_face = nullptr;
for (unsigned i = 0; i < subset_options.num_iterations; i++) for (unsigned i = 0; i < subset_options.num_iterations; i++)
@ -134,7 +135,7 @@ struct subset_consumer_t
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
using driver_t = main_font_text_t<subset_consumer_t>; using driver_t = main_font_text_t<subset_consumer_t, face_options_t>;
if (argc == 2 && !strcmp (argv[1], "--batch")) if (argc == 2 && !strcmp (argv[1], "--batch"))
{ {

3
util/main-font-text.hh
View File

@ -47,7 +47,7 @@ locale_to_utf8 (char *s)
return t; return t;
} }
template <typename consumer_t> template <typename consumer_t, typename font_options_t=font_options_t, typename text_options_t=text_options_t>
struct main_font_text_t struct main_font_text_t
{ {
int int
@ -88,4 +88,3 @@ struct main_font_text_t
}; };
#endif #endif