fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-03-05 13:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ft] Implement some more color conversion routines

Browse source 
Makes new COLR/CPAL implementation in FreeType work with cairo now.
Ie. Microsoft's Segoe UI Emoji Regular font renders (instead of
crashing cairo.)
This commit is contained in:
Behdad Esfahbod 2018-07-16 13:54:45 +02:00
parent 6112212794
commit 3ec4aa24aa
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -976,6 +976,11 @@ _compute_xrender_bitmap_size(FT_Bitmap *target,
pitch = width * 4; pitch = width * 4;
break; break;
case FT_PIXEL_MODE_BGRA:
/* each pixel is replicated into a 32-bit ARGB value */
pitch = width * 4;
break;
default: /* unsupported source format */ default: /* unsupported source format */
return -1; return -1;
} }
@ -1133,7 +1138,7 @@ _fill_xrender_bitmap(FT_Bitmap *target,
} }
break; break;
default: /* FT_PIXEL_MODE_LCD_V */ case FT_PIXEL_MODE_LCD_V:
/* convert vertical RGB into ARGB32 */ /* convert vertical RGB into ARGB32 */
if (!bgr) { if (!bgr) {
@ -1170,6 +1175,15 @@ _fill_xrender_bitmap(FT_Bitmap *target,
} }
} }
} }
break;
case FT_PIXEL_MODE_BGRA:
for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
memcpy (dstLine, srcLine, width * 4);
break;
default:
assert (0);
} }
} }
@ -1275,7 +1289,6 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
component_alpha = TRUE; component_alpha = TRUE;
} }
break; break;
#ifdef FT_LOAD_COLOR
case FT_PIXEL_MODE_BGRA: case FT_PIXEL_MODE_BGRA:
stride = width * 4; stride = width * 4;
if (own_buffer) { if (own_buffer) {
@ -1298,7 +1311,6 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
} }
format = CAIRO_FORMAT_ARGB32; format = CAIRO_FORMAT_ARGB32;
break; break;
#endif
case FT_PIXEL_MODE_GRAY2: case FT_PIXEL_MODE_GRAY2:
case FT_PIXEL_MODE_GRAY4: case FT_PIXEL_MODE_GRAY4:
convert: convert:
@ -2475,9 +2487,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font,
vertical_layout = TRUE; vertical_layout = TRUE;
} }
#ifdef FT_LOAD_COLOR
load_flags |= FT_LOAD_COLOR; load_flags |= FT_LOAD_COLOR;
#endif
if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) { if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) {
@ -2638,7 +2648,6 @@ LOAD:
} }
} }
#ifdef FT_LOAD_COLOR
if (((info & (CAIRO_SCALED_GLYPH_INFO_SURFACE | CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE)) != 0) && if (((info & (CAIRO_SCALED_GLYPH_INFO_SURFACE | CAIRO_SCALED_GLYPH_INFO_COLOR_SURFACE)) != 0) &&
((scaled_glyph->has_info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)) { ((scaled_glyph->has_info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)) {
/* /*
@ -2650,7 +2659,6 @@ LOAD:
load_flags &= ~FT_LOAD_COLOR; load_flags &= ~FT_LOAD_COLOR;
goto LOAD; goto LOAD;
} }
#endif
if (info & CAIRO_SCALED_GLYPH_INFO_PATH) { if (info & CAIRO_SCALED_GLYPH_INFO_PATH) {
cairo_path_fixed_t *path = NULL; /* hide compiler warning */ cairo_path_fixed_t *path = NULL; /* hide compiler warning */