Merge branch 'master' into iter
This commit is contained in:
commit
073fa4ac5a
|
@ -154,7 +154,8 @@ typedef struct OffsetTable
|
|||
c->align (4);
|
||||
const char *end = (const char *) c->head;
|
||||
|
||||
if (items[i].tag == HB_OT_TAG_head && end - start >= head::static_size)
|
||||
if (items[i].tag == HB_OT_TAG_head &&
|
||||
(unsigned) (end - start) >= head::static_size)
|
||||
{
|
||||
head *h = (head *) start;
|
||||
checksum_adjustment = &h->checkSumAdjustment;
|
||||
|
|
|
@ -56,7 +56,7 @@ struct SmallGlyphMetrics
|
|||
extents->x_bearing = bearingX;
|
||||
extents->y_bearing = bearingY;
|
||||
extents->width = width;
|
||||
extents->height = -height;
|
||||
extents->height = - (hb_position_t) height;
|
||||
}
|
||||
|
||||
HBUINT8 height;
|
||||
|
|
|
@ -215,9 +215,12 @@ struct hb_uniscribe_shaper_funcs_t
|
|||
hinstLib = GetModuleHandle (TEXT ("usp10.dll"));
|
||||
if (hinstLib)
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wcast-function-type"
|
||||
this->ScriptItemizeOpenType = (SIOT) GetProcAddress (hinstLib, "ScriptItemizeOpenType");
|
||||
this->ScriptShapeOpenType = (SSOT) GetProcAddress (hinstLib, "ScriptShapeOpenType");
|
||||
this->ScriptPlaceOpenType = (SPOT) GetProcAddress (hinstLib, "ScriptPlaceOpenType");
|
||||
#pragma GCC diagnostic pop
|
||||
}
|
||||
if (!this->ScriptItemizeOpenType ||
|
||||
!this->ScriptShapeOpenType ||
|
||||
|
|
Loading…
Reference in New Issue