From 1b13cc775c3b8143b1218e205b21b91b0852f8bd Mon Sep 17 00:00:00 2001 From: Michiharu Ariza Date: Thu, 21 Feb 2019 16:42:30 -0800 Subject: [PATCH] fixed compiler gripes --- src/hb-ot-var-hvar-table.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hb-ot-var-hvar-table.hh b/src/hb-ot-var-hvar-table.hh index fa74a37a9..7af2b8a2e 100644 --- a/src/hb-ot-var-hvar-table.hh +++ b/src/hb-ot-var-hvar-table.hh @@ -49,20 +49,20 @@ struct DeltaSetIndexMap { unsigned int width = plan.get_width (); unsigned int inner_bit_count = plan.get_inner_bit_count (); - auto map = plan.get_output_map (); + const hb_array_t output_map = plan.get_output_map (); TRACE_SERIALIZE (this); - if (unlikely (map.length && ((((inner_bit_count-1)&~0xF)!=0) || (((width-1)&~0x3)!=0)))) + if (unlikely (output_map.length && ((((inner_bit_count-1)&~0xF)!=0) || (((width-1)&~0x3)!=0)))) return_trace (false); if (unlikely (!c->extend_min (*this))) return_trace (false); format.set (((width-1)<<4)|(inner_bit_count-1)); - mapCount.set (map.length); - HBUINT8 *p = c->allocate_size (width * map.length); + mapCount.set (output_map.length); + HBUINT8 *p = c->allocate_size (width * output_map.length); if (unlikely (!p)) return_trace (false); - for (unsigned int i = 0; i < map.length; i++) + for (unsigned int i = 0; i < output_map.length; i++) { - unsigned int v = map[i]; + unsigned int v = output_map[i]; unsigned int outer = v >> 16; unsigned int inner = v & 0xFFFF; unsigned int u = (outer << inner_bit_count)|inner;