aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-10-30 03:29:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-30 03:29:20 +0000
commitc49984c5d8fa2125d6543498d0d48cf63fca0e63 (patch)
tree219d397d478597dc26b1eb9899386e56ca385b21
parent1ced7b9cb0671c693882a459a84c0062bf3c6fc8 (diff)
parenta15ba155bfe76a6599e542d6386f5b3808cd882c (diff)
downloadsfntly-c49984c5d8fa2125d6543498d0d48cf63fca0e63.tar.gz
Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: a15ba155bf
Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549 Change-Id: I47852720aa20b9cf89a1e17fde74eaa3e5ae0fd7
-rw-r--r--METADATA8
-rw-r--r--cpp/src/sample/chromium/subsetter_impl.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/METADATA b/METADATA
index b2bcc95..be0ff81 100644
--- a/METADATA
+++ b/METADATA
@@ -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;