From 7ea31f13c3ad1c830cca5cac34b0fa36d03c7705 Mon Sep 17 00:00:00 2001 From: hhb Date: Wed, 3 Jul 2019 21:25:59 -0700 Subject: Fix an uninitialized value --- cpp/src/sfntly/port/file_input_stream.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/sfntly/port/file_input_stream.cc b/cpp/src/sfntly/port/file_input_stream.cc index 12c1e12..87b7c8c 100644 --- a/cpp/src/sfntly/port/file_input_stream.cc +++ b/cpp/src/sfntly/port/file_input_stream.cc @@ -74,7 +74,7 @@ int32_t FileInputStream::Read() { #endif return 0; } - uint8_t value; + uint8_t value = 0; size_t length = fread(&value, 1, 1, file_); position_ += length; return value; -- cgit v1.2.3 From 018113eea46bb63865d7311371b5eb72433992f3 Mon Sep 17 00:00:00 2001 From: jfkthame Date: Mon, 16 Sep 2019 16:52:48 +0100 Subject: Restore space before "Regular" font name suffix This will revert to earlier behavior of HasName, by including a space when appending "Regular" to a base font name to synthesize a possible full name. (The space appears to have been inadvertently dropped during the migration to UCharString.) --- cpp/src/sample/chromium/subsetter_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3