diff --git a/src/hb-aat-layout-trak-table.hh b/src/hb-aat-layout-trak-table.hh index c2c50bbb7..823991f2f 100644 --- a/src/hb-aat-layout-trak-table.hh +++ b/src/hb-aat-layout-trak-table.hh @@ -55,7 +55,7 @@ struct TrackTableEntry unsigned int index, unsigned int nSizes) const { - return hb_array_t ((base+valuesZ).arrayZ, nSizes)[index]; + return hb_array ((base+valuesZ).arrayZ, nSizes)[index]; } public: diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh index 27c1a96ef..11a055068 100644 --- a/src/hb-dsalgs.hh +++ b/src/hb-dsalgs.hh @@ -537,6 +537,8 @@ struct hb_array_t T *arrayZ; unsigned int len; }; +template +hb_array_t hb_array (T *array, unsigned int len) { return hb_array_t (array, len); } struct hb_bytes_t { diff --git a/src/hb-open-file.hh b/src/hb-open-file.hh index a973455d7..3b742ea74 100644 --- a/src/hb-open-file.hh +++ b/src/hb-open-file.hh @@ -330,8 +330,7 @@ struct ResourceTypeRecord inline const ResourceRecord& get_resource_record (unsigned int i, const void *type_base) const { - return hb_array_t ((type_base+resourcesZ).arrayZ, - get_resource_count ()) [i]; + return hb_array ((type_base+resourcesZ).arrayZ, get_resource_count ())[i]; } inline bool sanitize (hb_sanitize_context_t *c, diff --git a/src/hb-ot-color-cpal-table.hh b/src/hb-ot-color-cpal-table.hh index 7dd0c0f90..4b09d3a5f 100644 --- a/src/hb-ot-color-cpal-table.hh +++ b/src/hb-ot-color-cpal-table.hh @@ -55,7 +55,7 @@ struct CPALV1Tail { if (!paletteFlagsZ) return HB_OT_COLOR_PALETTE_FLAG_DEFAULT; return (hb_ot_color_palette_flags_t) (uint32_t) - hb_array_t ((base+paletteFlagsZ).arrayZ, palette_count)[palette_index]; + hb_array ((base+paletteFlagsZ).arrayZ, palette_count)[palette_index]; } inline unsigned int @@ -64,7 +64,7 @@ struct CPALV1Tail unsigned int palette_count) const { if (!paletteLabelsZ) return HB_NAME_ID_INVALID; - return hb_array_t ((base+paletteLabelsZ).arrayZ, palette_count)[palette_index]; + return hb_array ((base+paletteLabelsZ).arrayZ, palette_count)[palette_index]; } inline unsigned int @@ -73,7 +73,7 @@ struct CPALV1Tail unsigned int color_count) const { if (!colorLabelsZ) return HB_NAME_ID_INVALID; - return hb_array_t ((base+colorLabelsZ).arrayZ, color_count)[color_index]; + return hb_array ((base+colorLabelsZ).arrayZ, color_count)[color_index]; } public: