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

[util] Accept comma as well as space when separating components of args 

Applies to --font-size and --margin.

Hopefully the scanf usage here doesn't have compatibility issues
(star being counted in the return value, etc).
This commit is contained in:
Behdad Esfahbod 2015-04-09 15:04:42 -07:00
parent 9c974360fe
commit a664810e38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/options.cc
View File

@ -174,7 +174,7 @@ parse_margin (const char *name G_GNUC_UNUSED,
{ {
view_options_t *view_opts = (view_options_t *) data; view_options_t *view_opts = (view_options_t *) data;
view_options_t::margin_t &m = view_opts->margin; view_options_t::margin_t &m = view_opts->margin;
switch (sscanf (arg, "%lf %lf %lf %lf", &m.t, &m.r, &m.b, &m.l)) { switch (sscanf (arg, "%lf%*[ ,]%lf%*[ ,]%lf%*[ ,]%lf", &m.t, &m.r, &m.b, &m.l)) {
case 1: m.r = m.t; case 1: m.r = m.t;
case 2: m.b = m.t; case 2: m.b = m.t;
case 3: m.l = m.r; case 3: m.l = m.r;
@ -361,7 +361,7 @@ parse_font_size (const char *name G_GNUC_UNUSED,
font_opts->font_size_y = font_opts->font_size_x = FONT_SIZE_UPEM; font_opts->font_size_y = font_opts->font_size_x = FONT_SIZE_UPEM;
return true; return true;
} }
switch (sscanf (arg, "%lf %lf", &font_opts->font_size_x, &font_opts->font_size_y)) { switch (sscanf (arg, "%lf%*[ ,]%lf", &font_opts->font_size_x, &font_opts->font_size_y)) {
case 1: font_opts->font_size_y = font_opts->font_size_x; case 1: font_opts->font_size_y = font_opts->font_size_x;
case 2: return true; case 2: return true;
default: default: