diff options
author | Haibo Huang <hhb@google.com> | 2020-10-30 04:06:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-30 04:06:21 +0000 |
commit | 4a0683d24f5835df17507d43c272fa262a4d5dbe (patch) | |
tree | 219d397d478597dc26b1eb9899386e56ca385b21 | |
parent | 3a13a8d170152f3332e12fdeb1f50fae57b78dc1 (diff) | |
parent | aff1fbc8eaa45cef644d10d83548091dce437916 (diff) | |
download | sfntly-4a0683d24f5835df17507d43c272fa262a4d5dbe.tar.gz |
Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba155bf am: c49984c5d8 am: aff1fbc8ea
Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549
Change-Id: Iba5a0bc3ad1d4efe11a34f93291b1ec18c947775
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | cpp/src/sample/chromium/subsetter_impl.cc | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -5,11 +5,11 @@ third_party { type: GIT value: "https://github.com/googlefonts/sfntly.git" } - version: "9620b607af5b796badefebcf16d7ce6e6786f205" + version: "1e7adf313bd9c488a70015f8df8782f7c65e9ce7" license_type: NOTICE last_upgrade_date { - year: 2019 - month: 5 - day: 3 + year: 2020 + month: 10 + day: 28 } } diff --git a/cpp/src/sample/chromium/subsetter_impl.cc b/cpp/src/sample/chromium/subsetter_impl.cc index d6c3216..5910591 100644 --- a/cpp/src/sample/chromium/subsetter_impl.cc +++ b/cpp/src/sample/chromium/subsetter_impl.cc @@ -133,7 +133,7 @@ bool HasName(const char* font_name, Font* font) { UCharString font_string = ConvertFromUtf8(font_name); if (font_string.empty()) return false; - UCharString regular_suffix = ConvertFromUtf8("Regular"); + UCharString regular_suffix = ConvertFromUtf8(" Regular"); UCharString alt_font_string = font_string; alt_font_string += regular_suffix; |