You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-24 15:26:15 +00:00
HarfBuzz: Update to version 8.1.1
This commit is contained in:
16
thirdparty/harfbuzz/src/hb-bit-set.hh
vendored
16
thirdparty/harfbuzz/src/hb-bit-set.hh
vendored
@@ -30,7 +30,6 @@
|
||||
|
||||
#include "hb.hh"
|
||||
#include "hb-bit-page.hh"
|
||||
#include "hb-machinery.hh"
|
||||
|
||||
|
||||
struct hb_bit_set_t
|
||||
@@ -183,6 +182,16 @@ struct hb_bit_set_t
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Duplicated here from hb-machinery.hh to avoid including it. */
|
||||
template<typename Type>
|
||||
static inline const Type& StructAtOffsetUnaligned(const void *P, unsigned int offset)
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wcast-align"
|
||||
return * reinterpret_cast<const Type*> ((const char *) P + offset);
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void set_array (bool v, const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{
|
||||
@@ -553,6 +562,7 @@ struct hb_bit_set_t
|
||||
count--;
|
||||
page_map.arrayZ[count] = page_map.arrayZ[a];
|
||||
page_at (count).v = op (page_at (a).v, other.page_at (b).v);
|
||||
page_at (count).dirty ();
|
||||
}
|
||||
else if (page_map.arrayZ[a - 1].major > other.page_map.arrayZ[b - 1].major)
|
||||
{
|
||||
@@ -571,7 +581,7 @@ struct hb_bit_set_t
|
||||
count--;
|
||||
page_map.arrayZ[count].major = other.page_map.arrayZ[b].major;
|
||||
page_map.arrayZ[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
page_at (count) = other.page_at (b);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -589,7 +599,7 @@ struct hb_bit_set_t
|
||||
count--;
|
||||
page_map.arrayZ[count].major = other.page_map.arrayZ[b].major;
|
||||
page_map.arrayZ[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
page_at (count) = other.page_at (b);
|
||||
}
|
||||
assert (!count);
|
||||
resize (newCount);
|
||||
|
||||
Reference in New Issue
Block a user