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

[hb-view] Support specifying color indices again

This commit is contained in:
Behdad Esfahbod 2023-01-20 15:52:09 -07:00
parent ab7c914425
commit 61719a8350
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-number.cc
View File

@ -24,7 +24,6 @@
*/ */
#include "hb.hh" #include "hb.hh"
#include "hb-machinery.hh"
#include "hb-number.hh" #include "hb-number.hh"
#include "hb-number-parser.hh" #include "hb-number-parser.hh"

16
util/helper-cairo.hh
View File

@ -130,12 +130,24 @@ helper_cairo_create_scaled_font (const font_options_t *font_opts,
if (view_opts->custom_palette) if (view_opts->custom_palette)
{ {
char **entries = g_strsplit (view_opts->custom_palette, ",", -1); char **entries = g_strsplit (view_opts->custom_palette, ",", -1);
unsigned idx = 0;
for (unsigned i = 0; entries[i]; i++) for (unsigned i = 0; entries[i]; i++)
{ {
const char *p = strchr (entries[i], '=');
if (!p)
p = entries[i];
else
{
sscanf (entries[i], "%u", &idx);
p++;
}
unsigned fr, fg, fb, fa; unsigned fr, fg, fb, fa;
fr = fg = fb = fa = 0; fr = fg = fb = fa = 0;
if (parse_color (entries[i], fr, fg,fb, fa)) if (parse_color (p, fr, fg,fb, fa))
cairo_font_options_set_custom_palette_color (font_options, i, fr / 255., fg / 255., fb / 255., fa / 255.); cairo_font_options_set_custom_palette_color (font_options, idx, fr / 255., fg / 255., fb / 255., fa / 255.);
idx++;
} }
g_strfreev (entries); g_strfreev (entries);
} }