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

[array] Fix rewinding

This commit is contained in:
David Corbett 2019-05-10 22:51:49 -04:00 committed by Behdad Esfahbod
parent 79126df307
commit b854d4ff46
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hb-array.hh
View File

@ -42,20 +42,20 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
/* /*
* Constructors. * Constructors.
*/ */
hb_array_t () : arrayZ (nullptr), length (0) {} hb_array_t () : arrayZ (nullptr), length (0), backwards_length (0) {}
hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_) {} hb_array_t (Type *array_, unsigned int length_) : arrayZ (array_), length (length_), backwards_length (0) {}
template <unsigned int length_> template <unsigned int length_>
hb_array_t (Type (&array_)[length_]) : arrayZ (array_), length (length_) {} hb_array_t (Type (&array_)[length_]) : arrayZ (array_), length (length_), backwards_length (0) {}
template <typename U, template <typename U,
hb_enable_if (hb_is_cr_convertible(U, Type))> hb_enable_if (hb_is_cr_convertible(U, Type))>
hb_array_t (const hb_array_t<U> &o) : hb_array_t (const hb_array_t<U> &o) :
hb_iter_with_fallback_t<hb_array_t<Type>, Type&> (), hb_iter_with_fallback_t<hb_array_t<Type>, Type&> (),
arrayZ (o.arrayZ), length (o.length) {} arrayZ (o.arrayZ), length (o.length), backwards_length (o.backwards_length) {}
template <typename U, template <typename U,
hb_enable_if (hb_is_cr_convertible(U, Type))> hb_enable_if (hb_is_cr_convertible(U, Type))>
hb_array_t& operator = (const hb_array_t<U> &o) hb_array_t& operator = (const hb_array_t<U> &o)
{ arrayZ = o.arrayZ; length = o.length; return *this; } { arrayZ = o.arrayZ; length = o.length; backwards_length = o.backwards_length; return *this; }
/* /*
* Iterator implementation. * Iterator implementation.
@ -72,17 +72,20 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
if (unlikely (n > length)) if (unlikely (n > length))
n = length; n = length;
length -= n; length -= n;
backwards_length += n;
arrayZ += n; arrayZ += n;
} }
void __rewind__ (unsigned n) void __rewind__ (unsigned n)
{ {
if (unlikely (n > length)) if (unlikely (n > backwards_length))
n = length; n = backwards_length;
length -= n; length += n;
backwards_length -= n;
arrayZ -= n;
} }
unsigned __len__ () const { return length; } unsigned __len__ () const { return length; }
bool operator != (const hb_array_t& o) const bool operator != (const hb_array_t& o) const
{ return arrayZ != o.arrayZ || length != o.length; } { return arrayZ != o.arrayZ || length != o.length || backwards_length != o.backwards_length; }
/* Extra operators. /* Extra operators.
*/ */
@ -199,6 +202,7 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
public: public:
Type *arrayZ; Type *arrayZ;
unsigned int length; unsigned int length;
unsigned int backwards_length;
}; };
template <typename T> inline hb_array_t<T> template <typename T> inline hb_array_t<T>
hb_array (T *array, unsigned int length) hb_array (T *array, unsigned int length)