This commit is contained in:
Behdad Esfahbod 2018-02-25 19:06:25 -08:00
parent 6dd46fa598
commit df1c7d5b60
2 changed files with 4 additions and 3 deletions

View File

@ -740,8 +740,6 @@ template <typename Type>
struct Offset : Type struct Offset : Type
{ {
inline bool is_null (void) const { return 0 == *this; } inline bool is_null (void) const { return 0 == *this; }
public:
DEFINE_SIZE_STATIC (sizeof(Type));
inline void *serialize (hb_serialize_context_t *c, const void *base) inline void *serialize (hb_serialize_context_t *c, const void *base)
{ {
@ -749,6 +747,9 @@ struct Offset : Type
this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */ this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */
return t; return t;
} }
public:
DEFINE_SIZE_STATIC (sizeof(Type));
}; };
typedef Offset<HBUINT16> Offset16; typedef Offset<HBUINT16> Offset16;

View File

@ -136,7 +136,7 @@ _hb_subset_face_data_destroy (void *user_data)
{ {
hb_subset_face_data_t *data = (hb_subset_face_data_t *) user_data; hb_subset_face_data_t *data = (hb_subset_face_data_t *) user_data;
for (int i = 0; i < data->tables.len; i++) for (unsigned int i = 0; i < data->tables.len; i++)
hb_blob_destroy (data->tables[i].blob); hb_blob_destroy (data->tables[i].blob);
data->tables.finish (); data->tables.finish ();