[base] Restore quiet no-op rendering of bitmap glyphs.
Fixes #1076. * src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when rendering a bitmap glyph.
This commit is contained in:
parent
de3b5c201c
commit
6e9d8d314f
|
@ -4703,7 +4703,7 @@
|
||||||
else
|
else
|
||||||
renderer = FT_Lookup_Renderer( library, slot->format, &node );
|
renderer = FT_Lookup_Renderer( library, slot->format, &node );
|
||||||
|
|
||||||
error = FT_ERR( Unimplemented_Feature );
|
error = FT_ERR( Cannot_Render_Glyph );
|
||||||
while ( renderer )
|
while ( renderer )
|
||||||
{
|
{
|
||||||
error = renderer->render( renderer, slot, render_mode, NULL );
|
error = renderer->render( renderer, slot, render_mode, NULL );
|
||||||
|
@ -4719,6 +4719,11 @@
|
||||||
/* format. */
|
/* format. */
|
||||||
renderer = FT_Lookup_Renderer( library, slot->format, &node );
|
renderer = FT_Lookup_Renderer( library, slot->format, &node );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* it is not an error if we cannot render a bitmat glyph */
|
||||||
|
if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
|
||||||
|
slot->format == FT_GLYPH_FORMAT_BITMAP )
|
||||||
|
error = FT_Err_Ok;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue