[util] Rename main_font_text back to main_font_text_t

This commit is contained in:
Behdad Esfahbod 2021-08-11 16:46:04 -06:00
parent 7e4fcf1be8
commit 9468e46998
5 changed files with 5 additions and 5 deletions

View File

@ -114,5 +114,5 @@ struct shape_closure_consumer_t
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
return main_font_text<shape_closure_consumer_t, font_options_t, text_options_t> () (argc, argv); return main_font_text_t<shape_closure_consumer_t, font_options_t, text_options_t> () (argc, argv);
} }

View File

@ -162,6 +162,6 @@ struct output_buffer_t : output_options_t
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
using main_t = main_font_text<shape_consumer_t<output_buffer_t>, font_options_t, text_options_t>; using main_t = main_font_text_t<shape_consumer_t<output_buffer_t>, font_options_t, text_options_t>;
return batch_main<main_t> (argc, argv); return batch_main<main_t> (argc, argv);
} }

View File

@ -129,6 +129,6 @@ struct subset_consumer_t : subset_options_t, output_options_t
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
using main_t = main_font_text<subset_consumer_t, face_options_t, text_options_t>; using main_t = main_font_text_t<subset_consumer_t, face_options_t, text_options_t>;
return batch_main<main_t, true> (argc, argv); return batch_main<main_t, true> (argc, argv);
} }

View File

@ -37,5 +37,5 @@ const unsigned SUBPIXEL_BITS = 6;
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
return main_font_text<shape_consumer_t<view_cairo_t>, font_options_t, text_options_t> () (argc, argv); return main_font_text_t<shape_consumer_t<view_cairo_t>, font_options_t, text_options_t> () (argc, argv);
} }

View File

@ -32,7 +32,7 @@
/* main() body for utilities taking font and processing text.*/ /* main() body for utilities taking font and processing text.*/
template <typename consumer_t, typename font_options_t, typename text_options_t> template <typename consumer_t, typename font_options_t, typename text_options_t>
struct main_font_text : font_options_t, text_options_t, consumer_t struct main_font_text_t : font_options_t, text_options_t, consumer_t
{ {
void add_options (struct option_parser_t *parser) void add_options (struct option_parser_t *parser)
{ {