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

[util/main-font-text] Simplify

This commit is contained in:
Behdad Esfahbod 2021-08-05 14:03:48 -06:00
parent 71440dbd90
commit b3a2f2bfcf
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,18 +50,18 @@ locale_to_utf8 (char *s)
template <typename consumer_t> template <typename consumer_t>
struct main_font_text_t struct main_font_text_t
{ {
void add_options (option_parser_t *parser)
{
font_opts.add_options (parser);
input.add_options (parser);
consumer.add_options (parser);
}
int int
main (int argc, char **argv, int eol = '\n') main (int argc, char **argv, int eol = '\n')
{ {
font_options_t font_opts;
text_options_t input;
consumer_t consumer;
option_parser_t options ("[FONT-FILE] [TEXT]"); option_parser_t options ("[FONT-FILE] [TEXT]");
add_options (&options); font_opts.add_options (&options);
input.add_options (&options);
consumer.add_options (&options);
options.parse (&argc, &argv); options.parse (&argc, &argv);
argc--, argv++; argc--, argv++;
@ -85,11 +85,6 @@ struct main_font_text_t
return consumer.failed ? 1 : 0; return consumer.failed ? 1 : 0;
} }
protected:
font_options_t font_opts;
text_options_t input;
consumer_t consumer;
}; };
#endif #endif