From c3b919224b2b02826bddf55535535ab47638844d Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 1 Jun 2019 08:54:42 +0000 Subject: harfbuzz-2.5.1 git-svn-id: svn://tug.org/texlive/trunk@51283 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh') diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh index 6113dbcf89a..1ac9f6ba204 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-glyf-table.hh @@ -85,7 +85,7 @@ struct glyf static bool _add_loca_and_head (hb_subset_plan_t * plan, Iterator padded_offsets) { - unsigned int max_offset = + padded_offsets | hb_reduce (hb_max, 0); + unsigned max_offset = + padded_offsets | hb_reduce(hb_add, 0); unsigned num_offsets = padded_offsets.len () + 1; bool use_short_loca = max_offset < 0x1FFFF; unsigned entry_size = use_short_loca ? 2 : 4; @@ -93,6 +93,8 @@ struct glyf if (unlikely (!loca_prime_data)) return false; + DEBUG_MSG(SUBSET, nullptr, "loca entry_size %d num_offsets %d max_offset %d size %d", entry_size, num_offsets, max_offset, entry_size * num_offsets); + if (use_short_loca) _write_loca (padded_offsets, 1, hb_array ((HBUINT16*) loca_prime_data, num_offsets)); else @@ -164,6 +166,7 @@ struct glyf | hb_map (&SubsetGlyph::padded_size) ; + if (c->serializer->in_error ()) return_trace (false); return_trace (c->serializer->check_success (_add_loca_and_head (c->plan, padded_offsets))); } -- cgit v1.2.3