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

[util/hb-shape] Refactor driver type duplication

This commit is contained in:
Behdad Esfahbod 2021-08-01 08:14:59 -06:00
parent 05cf81283b
commit ed99c80623
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/hb-shape.cc
View File

@ -154,6 +154,9 @@ struct output_buffer_t
hb_buffer_serialize_flags_t format_flags;
};
template <int eol = '\n'>
using driver_t = main_font_text_t<shape_consumer_t<output_buffer_t>, FONT_SIZE_UPEM, 0, eol>;
int
main (int argc, char **argv)
{
@ -165,7 +168,7 @@ main (int argc, char **argv)
{
size_t l = strlen (buf);
if (l && buf[l - 1] == '\n') buf[l - 1] = '\0';
main_font_text_t<shape_consumer_t<output_buffer_t>, FONT_SIZE_UPEM, 0, EOF> driver;
char *args[32];
argc = 0;
char *p = buf, *e;
@ -180,7 +183,10 @@ main (int argc, char **argv)
/* Skip 2 first bytes on first argument if is Windows path, "C:\..." */
start_offset = argc == 2 && p[0] != '\0' && p[0] != ':' && p[1] == ':' && (p[2] == '\\' || p[2] == '/') ? 2 : 0;
}
driver_t<EOF> driver;
ret |= driver.main (argc, args);
fflush (stdout);
if (ret)
@ -188,6 +194,7 @@ main (int argc, char **argv)
}
return ret;
}
main_font_text_t<shape_consumer_t<output_buffer_t>, FONT_SIZE_UPEM, 0> driver;
driver_t<> driver;
return driver.main (argc, argv);
}