diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh index 0038ad8b7da9a85d42219fd60172d540369392da..69cc5ccf3e2baf86464cc264bf41c87bb1eea836 100644 --- a/src/hb-open-type.hh +++ b/src/hb-open-type.hh @@ -374,16 +374,17 @@ struct UnsizedArrayOf return *p; } - template inline operator T * (void) { return arrayZ; } - template inline operator const T * (void) const { return arrayZ; } - inline unsigned int get_size (unsigned int len) const { return len * Type::static_size; } + template inline operator T * (void) { return arrayZ; } + template inline operator const T * (void) const { return arrayZ; } inline hb_array_t as_array (unsigned int len) { return hb_array (arrayZ, len); } inline hb_array_t as_array (unsigned int len) const { return hb_array (arrayZ, len); } + inline operator hb_array_t (void) { return as_array (); } + inline operator hb_array_t (void) const { as_array (); } template inline Type &lsearch (unsigned int len, const T &x, Type ¬_found = Crap (Type)) @@ -488,6 +489,8 @@ struct SortedUnsizedArrayOf : UnsizedArrayOf { return hb_sorted_array (this->arrayZ, len); } inline hb_sorted_array_t as_array (unsigned int len) const { return hb_sorted_array (this->arrayZ, len); } + inline operator hb_sorted_array_t (void) { return as_array (); } + inline operator hb_sorted_array_t (void) const { as_array (); } template inline Type &bsearch (unsigned int len, const T &x, Type ¬_found = Crap (Type)) @@ -533,6 +536,8 @@ struct ArrayOf { return hb_array (arrayZ, len); } inline hb_array_t as_array (void) const { return hb_array (arrayZ, len); } + inline operator hb_array_t (void) { return as_array (); } + inline operator hb_array_t (void) const { as_array (); } inline hb_array_t sub_array (unsigned int start_offset, unsigned int count) const { return as_array ().sub_array (start_offset, count);} @@ -802,6 +807,8 @@ struct SortedArrayOf : ArrayOf { return hb_sorted_array (this->arrayZ, this->len); } inline hb_sorted_array_t as_array (void) const { return hb_sorted_array (this->arrayZ, this->len); } + inline operator hb_sorted_array_t (void) { return as_array (); } + inline operator hb_sorted_array_t (void) const { as_array (); } inline hb_array_t sub_array (unsigned int start_offset, unsigned int count) const { return as_array ().sub_array (start_offset, count);} diff --git a/src/hb-vector.hh b/src/hb-vector.hh index 953a776e0a2e42ddd4de7b8d62957767c25d0707..4b34a3815f0d966c939a1f730d43b7b1d51af16b 100644 --- a/src/hb-vector.hh +++ b/src/hb-vector.hh @@ -105,6 +105,8 @@ struct hb_vector_t template explicit_operator inline operator T * (void) { return arrayZ(); } template explicit_operator inline operator const T * (void) const { return arrayZ(); } + inline operator hb_array_t (void) { return as_array (); } + inline operator hb_array_t (void) const { as_array (); } inline Type * operator + (unsigned int i) { return arrayZ() + i; } inline const Type * operator + (unsigned int i) const { return arrayZ() + i; }