walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add hb_array<>() 

Simplifies transient object creation.

Fixes https://github.com/harfbuzz/harfbuzz/issues/1301
This commit is contained in:
Behdad Esfahbod 2018-10-22 21:27:45 -07:00
parent 17ffbc070f
commit abfbba1911
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-aat-layout-trak-table.hh
View File

@ -55,7 +55,7 @@ struct TrackTableEntry
unsigned int index, unsigned int index,
unsigned int nSizes) const unsigned int nSizes) const
{ {
return hb_array_t<const FWORD> ((base+valuesZ).arrayZ, nSizes)[index]; return hb_array ((base+valuesZ).arrayZ, nSizes)[index];
} }
public: public:

2
src/hb-dsalgs.hh
View File

@ -537,6 +537,8 @@ struct hb_array_t
T *arrayZ; T *arrayZ;
unsigned int len; unsigned int len;
}; };
template <typename T>
hb_array_t<T> hb_array (T *array, unsigned int len) { return hb_array_t<T> (array, len); }
struct hb_bytes_t struct hb_bytes_t
{ {

3
src/hb-open-file.hh
View File

@ -330,8 +330,7 @@ struct ResourceTypeRecord
inline const ResourceRecord& get_resource_record (unsigned int i, inline const ResourceRecord& get_resource_record (unsigned int i,
const void *type_base) const const void *type_base) const
{ {
return hb_array_t<const ResourceRecord> ((type_base+resourcesZ).arrayZ, return hb_array ((type_base+resourcesZ).arrayZ, get_resource_count ())[i];
get_resource_count ()) [i];
} }
inline bool sanitize (hb_sanitize_context_t *c, inline bool sanitize (hb_sanitize_context_t *c,

6
src/hb-ot-color-cpal-table.hh
View File

@ -55,7 +55,7 @@ struct CPALV1Tail
{ {
if (!paletteFlagsZ) return HB_OT_COLOR_PALETTE_FLAG_DEFAULT; if (!paletteFlagsZ) return HB_OT_COLOR_PALETTE_FLAG_DEFAULT;
return (hb_ot_color_palette_flags_t) (uint32_t) return (hb_ot_color_palette_flags_t) (uint32_t)
hb_array_t<const HBUINT32> ((base+paletteFlagsZ).arrayZ, palette_count)[palette_index]; hb_array ((base+paletteFlagsZ).arrayZ, palette_count)[palette_index];
} }
inline unsigned int inline unsigned int
@ -64,7 +64,7 @@ struct CPALV1Tail
unsigned int palette_count) const unsigned int palette_count) const
{ {
if (!paletteLabelsZ) return HB_NAME_ID_INVALID; if (!paletteLabelsZ) return HB_NAME_ID_INVALID;
return hb_array_t<const NameID> ((base+paletteLabelsZ).arrayZ, palette_count)[palette_index]; return hb_array ((base+paletteLabelsZ).arrayZ, palette_count)[palette_index];
} }
inline unsigned int inline unsigned int
@ -73,7 +73,7 @@ struct CPALV1Tail
unsigned int color_count) const unsigned int color_count) const
{ {
if (!colorLabelsZ) return HB_NAME_ID_INVALID; if (!colorLabelsZ) return HB_NAME_ID_INVALID;
return hb_array_t<const NameID> ((base+colorLabelsZ).arrayZ, color_count)[color_index]; return hb_array ((base+colorLabelsZ).arrayZ, color_count)[color_index];
} }
public: public: