mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2025-12-31 10:10:18 +01:00
[cairo-ft-font.c] conditionalize the changes by 3ec4aa24 on 2018-07-16 for legacy FreeType2 without color font feature
This commit is contained in:
parent
3c4570f8f4
commit
c0ed8ce1a1
1 changed files with 10 additions and 0 deletions
|
|
@ -976,10 +976,12 @@ _compute_xrender_bitmap_size(FT_Bitmap *target,
|
|||
pitch = width * 4;
|
||||
break;
|
||||
|
||||
#ifdef FT_PIXEL_MODE_BGRA
|
||||
case FT_PIXEL_MODE_BGRA:
|
||||
/* each pixel is replicated into a 32-bit ARGB value */
|
||||
pitch = width * 4;
|
||||
break;
|
||||
#endif
|
||||
|
||||
default: /* unsupported source format */
|
||||
return -1;
|
||||
|
|
@ -1177,10 +1179,12 @@ _fill_xrender_bitmap(FT_Bitmap *target,
|
|||
}
|
||||
break;
|
||||
|
||||
#ifdef FT_PIXEL_MODE_BGRA
|
||||
case FT_PIXEL_MODE_BGRA:
|
||||
for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
|
||||
memcpy (dstLine, srcLine, width * 4);
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
assert (0);
|
||||
|
|
@ -1289,6 +1293,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
|
|||
component_alpha = TRUE;
|
||||
}
|
||||
break;
|
||||
#ifdef FT_PIXEL_MODE_BGRA
|
||||
case FT_PIXEL_MODE_BGRA:
|
||||
stride = width * 4;
|
||||
if (own_buffer) {
|
||||
|
|
@ -1311,6 +1316,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
|
|||
}
|
||||
format = CAIRO_FORMAT_ARGB32;
|
||||
break;
|
||||
#endif
|
||||
case FT_PIXEL_MODE_GRAY2:
|
||||
case FT_PIXEL_MODE_GRAY4:
|
||||
convert:
|
||||
|
|
@ -2487,7 +2493,9 @@ _cairo_ft_scaled_glyph_init (void *abstract_font,
|
|||
vertical_layout = TRUE;
|
||||
}
|
||||
|
||||
#ifdef FT_LOAD_COLOR
|
||||
load_flags |= FT_LOAD_COLOR;
|
||||
#endif
|
||||
|
||||
|
||||
if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) {
|
||||
|
|
@ -2656,7 +2664,9 @@ LOAD:
|
|||
*/
|
||||
scaled_glyph_loaded = FALSE;
|
||||
info &= ~CAIRO_SCALED_GLYPH_INFO_METRICS;
|
||||
#ifdef FT_LOAD_COLOR
|
||||
load_flags &= ~FT_LOAD_COLOR;
|
||||
#endif
|
||||
goto LOAD;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue