diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-08-21 18:57:13 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-08-22 08:59:54 +0200 |
commit | cf1ce311aa18fe90657998c5f1ec9f9eec01831f (patch) | |
tree | 24c5640cc02c5691310ae425301eaf5583c4b795 /source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch | |
parent | 22c2e383b0af382c38db014d9155517c80281305 (diff) | |
download | current-cf1ce311aa18fe90657998c5f1ec9f9eec01831f.tar.gz current-cf1ce311aa18fe90657998c5f1ec9f9eec01831f.tar.xz |
Sat Aug 21 18:57:13 UTC 202120210821185713
a/upower-0.99.13-x86_64-1.txz: Upgraded.
a/xfsprogs-5.13.0-x86_64-1.txz: Upgraded.
l/freetype-2.11.0-x86_64-2.txz: Rebuilt.
Restore quiet no-op rendering of bitmap glyphs.
Diffstat (limited to 'source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch')
-rw-r--r-- | source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch new file mode 100644 index 000000000..b91780f14 --- /dev/null +++ b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch @@ -0,0 +1,42 @@ +From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 +From: Alexei Podtelezhnikov <apodtele@gmail.com> +Date: Fri, 20 Aug 2021 16:01:32 -0400 +Subject: [PATCH] [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. +--- + src/base/ftobjs.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c +index 342ac4a27..7b40c6421 100644 +--- a/src/base/ftobjs.c ++++ b/src/base/ftobjs.c +@@ -4703,7 +4703,7 @@ + else + renderer = FT_Lookup_Renderer( library, slot->format, &node ); + +- error = FT_ERR( Unimplemented_Feature ); ++ error = FT_ERR( Cannot_Render_Glyph ); + while ( renderer ) + { + error = renderer->render( renderer, slot, render_mode, NULL ); +@@ -4719,6 +4719,11 @@ + /* format. */ + 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; + } + } + +-- +GitLab + + |