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

Remove const from hb_array_t details 

Will come in through <T> if desired.
This commit is contained in:
Behdad Esfahbod 2018-10-22 16:18:34 -07:00
parent f3336580dd
commit d7865107ea
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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<FWORD> ((base+valuesZ).arrayZ, nSizes)[index]; return hb_array_t<const FWORD> ((base+valuesZ).arrayZ, nSizes)[index];
} }
public: public:
@ -88,7 +88,7 @@ struct TrackData
const void *base) const const void *base) const
{ {
unsigned int sizes = nSizes; unsigned int sizes = nSizes;
hb_array_t<Fixed> size_table ((base+sizeTable).arrayZ, sizes); hb_array_t<const Fixed> size_table ((base+sizeTable).arrayZ, sizes);
float s0 = size_table[idx].to_float (); float s0 = size_table[idx].to_float ();
float s1 = size_table[idx + 1].to_float (); float s1 = size_table[idx + 1].to_float ();
@ -134,7 +134,7 @@ struct TrackData
if (sizes == 1) return trackTableEntry->get_value (base, 0, sizes); if (sizes == 1) return trackTableEntry->get_value (base, 0, sizes);
/* TODO bfind() */ /* TODO bfind() */
hb_array_t<Fixed> size_table ((base+sizeTable).arrayZ, sizes); hb_array_t<const Fixed> size_table ((base+sizeTable).arrayZ, sizes);
unsigned int size_index; unsigned int size_index;
for (size_index = 0; size_index < sizes - 1; size_index++) for (size_index = 0; size_index < sizes - 1; size_index++)
if (size_table[size_index].to_float () >= csspx) if (size_table[size_index].to_float () >= csspx)

6
src/hb-dsalgs.hh
View File

@ -513,9 +513,9 @@ template <typename T>
struct hb_array_t struct hb_array_t
{ {
inline hb_array_t (void) : arrayZ (nullptr), len (0) {} inline hb_array_t (void) : arrayZ (nullptr), len (0) {}
inline hb_array_t (const T *array_, unsigned int len_) : arrayZ (array_), len (len_) {} inline hb_array_t (T *array_, unsigned int len_) : arrayZ (array_), len (len_) {}
inline const T& operator [] (unsigned int i) const inline T& operator [] (unsigned int i) const
{ {
if (unlikely (i >= len)) return Null(T); if (unlikely (i >= len)) return Null(T);
return arrayZ[i]; return arrayZ[i];
@ -534,7 +534,7 @@ struct hb_array_t
inline void free (void) { ::free ((void *) arrayZ); arrayZ = nullptr; len = 0; } inline void free (void) { ::free ((void *) arrayZ); arrayZ = nullptr; len = 0; }
const T *arrayZ; T *arrayZ;
unsigned int len; unsigned int len;
}; };

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

@ -330,8 +330,8 @@ 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<ResourceRecord> ((type_base+resourcesZ).arrayZ, return hb_array_t<const ResourceRecord> ((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,