From 77ba432cf7f046d3f5c29d738279e898bdd02a5c Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 24 May 2019 23:03:55 +0000 Subject: harfbuzz-2.5.0 git-svn-id: svn://tug.org/texlive/trunk@51218 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh') diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh index 9ef1f57168d..b3a97109b87 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-hmtx-table.hh @@ -78,7 +78,7 @@ struct hmtxvmtx unsigned int length; H *table = (H *) hb_blob_get_data (dest_blob, &length); - table->numberOfLongMetrics.set (num_hmetrics); + table->numberOfLongMetrics = num_hmetrics; bool result = plan->add_table (H::tableTag, dest_blob); hb_blob_destroy (dest_blob); @@ -128,12 +128,12 @@ struct hmtxvmtx bool has_advance = i < num_advances; if (has_advance) { - ((LongMetric *) dest_pos)->advance.set (advance); - ((LongMetric *) dest_pos)->sb.set (side_bearing); + ((LongMetric *) dest_pos)->advance = advance; + ((LongMetric *) dest_pos)->sb = side_bearing; } else { - ((FWORD *) dest_pos)->set (side_bearing); + *((FWORD *) dest_pos) = side_bearing; } dest_pos += (has_advance ? 4 : 2); } @@ -240,7 +240,7 @@ struct hmtxvmtx return default_advance; } - return table->longMetricZ[MIN (glyph, (uint32_t) num_advances - 1)].advance; + return table->longMetricZ[hb_min (glyph, (uint32_t) num_advances - 1)].advance; } unsigned int get_advance (hb_codepoint_t glyph, -- cgit v1.2.3