fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-08 10:18:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reshuffle code for clarity

Browse source 
Only loop over custom colors if we got
a palette selected successfully.
This commit is contained in:
Matthias Clasen 2023-01-20 20:39:23 -05:00
parent be1d41f001
commit 733e298bea
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cairo-ft-font.c
View file

@ -2531,24 +2531,24 @@ _cairo_ft_scaled_glyph_set_palette (cairo_ft_scaled_font_t *scaled_font,
num_entries = 0;
entries = NULL;
if (FT_Palette_Data_Get (face, &palette_data) == 0 && palette_data.num_palettes > 0) {
FT_UShort palette_index = CAIRO_COLOR_PALETTE_DEFAULT;
if (scaled_font->base.options.palette_index < palette_data.num_palettes)
palette_index = scaled_font->base.options.palette_index;
num_entries = palette_data.num_palette_entries;
if (FT_Palette_Select (face, palette_index, &entries) != 0) {
num_entries = 0;
entries = NULL;
}
if (FT_Palette_Select (face, palette_index, &entries) == 0) {
num_entries = palette_data.num_palette_entries;
for (unsigned int i = 0; i < scaled_font->base.options.custom_palette_size; i++) {
cairo_palette_color_t *entry = &scaled_font->base.options.custom_palette[i];
if (entry->index < num_entries) {
entries[entry->index].red = 255 * entry->red;
entries[entry->index].green = 255 * entry->green;
entries[entry->index].blue = 255 * entry->blue;
entries[entry->index].alpha = 255 * entry->alpha;
/* Overlay custom colors */
for (unsigned int i = 0; i < scaled_font->base.options.custom_palette_size; i++) {
cairo_palette_color_t *entry = &scaled_font->base.options.custom_palette[i];
if (entry->index < num_entries) {
entries[entry->index].red = 255 * entry->red;
entries[entry->index].green = 255 * entry->green;
entries[entry->index].blue = 255 * entry->blue;
entries[entry->index].alpha = 255 * entry->alpha;
}
}
}
}