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

Merge branch 'master' into iter

This commit is contained in:
Behdad Esfahbod 2019-01-28 14:35:41 -05:00
parent d592bd16cd 9a1df82e3f
commit 073fa4ac5a
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-open-file.hh
View File

@ -154,7 +154,8 @@ typedef struct OffsetTable
c->align (4); c->align (4);
const char *end = (const char *) c->head; 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; head *h = (head *) start;
checksum_adjustment = &h->checkSumAdjustment; checksum_adjustment = &h->checkSumAdjustment;

2
src/hb-ot-color-cbdt-table.hh
View File

@ -56,7 +56,7 @@ struct SmallGlyphMetrics
extents->x_bearing = bearingX; extents->x_bearing = bearingX;
extents->y_bearing = bearingY; extents->y_bearing = bearingY;
extents->width = width; extents->width = width;
extents->height = -height; extents->height = - (hb_position_t) height;
} }
HBUINT8 height; HBUINT8 height;

3
src/hb-uniscribe.cc
View File

@ -215,9 +215,12 @@ struct hb_uniscribe_shaper_funcs_t
hinstLib = GetModuleHandle (TEXT ("usp10.dll")); hinstLib = GetModuleHandle (TEXT ("usp10.dll"));
if (hinstLib) if (hinstLib)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-function-type"
this->ScriptItemizeOpenType = (SIOT) GetProcAddress (hinstLib, "ScriptItemizeOpenType"); this->ScriptItemizeOpenType = (SIOT) GetProcAddress (hinstLib, "ScriptItemizeOpenType");
this->ScriptShapeOpenType = (SSOT) GetProcAddress (hinstLib, "ScriptShapeOpenType"); this->ScriptShapeOpenType = (SSOT) GetProcAddress (hinstLib, "ScriptShapeOpenType");
this->ScriptPlaceOpenType = (SPOT) GetProcAddress (hinstLib, "ScriptPlaceOpenType"); this->ScriptPlaceOpenType = (SPOT) GetProcAddress (hinstLib, "ScriptPlaceOpenType");
#pragma GCC diagnostic pop
} }
if (!this->ScriptItemizeOpenType || if (!this->ScriptItemizeOpenType ||
!this->ScriptShapeOpenType || !this->ScriptShapeOpenType ||

3
src/hb.hh
View File

@ -30,6 +30,9 @@
#define HB_HH #define HB_HH
#ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC #ifndef HB_NO_PRAGMA_GCC_DIAGNOSTIC
#if defined(_MSC_VER)
#pragma warning( disable: 4068 ) /* Unknown pragma */
#endif
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
/* Rules: /* Rules:
* *