From baf879f4f8acf0f665bf1bff45a5c02e7f3c55a1 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 20 Dec 2021 08:22:34 -0700 Subject: [PATCH] upgrade freetype to 2.11.1 refs: #1419 --- deps/freetype/freetype2 | 2 +- docs/changelog.md | 1 + wezterm-font/src/ftwrap.rs | 12 ------------ 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/deps/freetype/freetype2 b/deps/freetype/freetype2 index 5bcaf51b6..3f83daeec 160000 --- a/deps/freetype/freetype2 +++ b/deps/freetype/freetype2 @@ -1 +1 @@ -Subproject commit 5bcaf51b611ce579c89c2bb423984ec89fdaadd7 +Subproject commit 3f83daeecb1a78d851b660eed025eeba362c0e4a diff --git a/docs/changelog.md b/docs/changelog.md index 3cdc2350c..3b5a6e0f6 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -26,6 +26,7 @@ As features stabilize some brief notes about them will accumulate here. #### Updated and Improved * Bundled harfbuzz to 3.2.0 +* Bundled freetype to 2.11.1 * macos: removing the titlebar from `window_decorations` now preserves rounded window corners [#1034](https://github.com/wez/wezterm/issues/1034) #### Fixed diff --git a/wezterm-font/src/ftwrap.rs b/wezterm-font/src/ftwrap.rs index fe47c3a45..b61a317ad 100644 --- a/wezterm-font/src/ftwrap.rs +++ b/wezterm-font/src/ftwrap.rs @@ -600,18 +600,6 @@ impl Face { FT_GlyphSlot_Embolden(slot as *mut _); } - if let Some(size) = self.size.as_ref() { - if !size.is_scaled { - // Non-scaled == bitmap, which doesn't need to be rendered. - // We check specially for this because freetype 2.11 - // started to return an error in this case. - // - // This workaround can be removed when freetype 2.11.1 - // is released and we upgrade to it. - return Ok(slot); - } - } - ft_result(FT_Render_Glyph(slot, render_mode), ()) .context("load_and_render_glyph: FT_Render_Glyph")?; Ok(slot)