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

[hb-cairo] Macro hygiene

This commit is contained in:
Behdad Esfahbod 2023-01-20 15:30:07 -07:00
parent 574d9344dc
commit 68a73e436a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-cairo.cc
View File

@ -324,13 +324,13 @@ hb_cairo_paint_custom_palette_color (hb_paint_funcs_t *funcs,
#ifdef HAVE_CAIRO_FONT_OPTIONS_GET_CUSTOM_PALETTE_COLOR #ifdef HAVE_CAIRO_FONT_OPTIONS_GET_CUSTOM_PALETTE_COLOR
cairo_t *cr = (cairo_t *) paint_data; cairo_t *cr = (cairo_t *) paint_data;
#define DEADBEEF HB_TAG(0xDE,0xAD,0xBE,0xEF) #define HB_DEADBEEF HB_TAG(0xDE,0xAD,0xBE,0xEF)
hb_map_t *color_cache = (hb_map_t *) cairo_get_user_data (cr, &color_cache_key); hb_map_t *color_cache = (hb_map_t *) cairo_get_user_data (cr, &color_cache_key);
hb_codepoint_t *c; hb_codepoint_t *c;
if (likely (color_cache && color_cache->has (color_index, &c))) if (likely (color_cache && color_cache->has (color_index, &c)))
{ {
if (*c == DEADBEEF) if (*c == HB_DEADBEEF)
return false; return false;
*color = *c; *color = *c;
return true; return true;
@ -348,7 +348,7 @@ hb_cairo_paint_custom_palette_color (hb_paint_funcs_t *funcs,
cairo_font_options_destroy (options); cairo_font_options_destroy (options);
*color = HB_COLOR (255 * blue, 255 * green, 255 * red, 255 * alpha); *color = HB_COLOR (255 * blue, 255 * green, 255 * red, 255 * alpha);
if (likely (color_cache && *color != DEADBEEF)) if (likely (color_cache && *color != HB_DEADBEEF))
color_cache->set (color_index, *color); color_cache->set (color_index, *color);
return true; return true;
@ -357,7 +357,9 @@ hb_cairo_paint_custom_palette_color (hb_paint_funcs_t *funcs,
#endif #endif
if (likely (color_cache)) if (likely (color_cache))
color_cache->set (color_index, DEADBEEF); color_cache->set (color_index, HB_DEADBEEF);
#undef HB_DEADBEEF
return false; return false;
} }