--- old/src/java.desktop/share/native/common/font/fontscalerdefs.h 2019-03-06 15:02:41.148365200 +0300 +++ new/src/java.desktop/share/native/common/font/fontscalerdefs.h 2019-03-06 15:02:40.644124600 +0300 @@ -88,32 +88,8 @@ */ #define INVISIBLE_GLYPHS 0xfffe -#define GSUB_TAG 0x47535542 /* 'GSUB' */ -#define GPOS_TAG 0x47504F53 /* 'GPOS' */ -#define GDEF_TAG 0x47444546 /* 'GDEF' */ -#define HEAD_TAG 0x68656164 /* 'head' */ -#define MORT_TAG 0x6D6F7274 /* 'mort' */ -#define MORX_TAG 0x6D6F7278 /* 'morx' */ -#define KERN_TAG 0x6B65726E /* 'kern' */ - -typedef struct TTLayoutTableCacheEntry { - const void* ptr; - int len; - int tag; -} TTLayoutTableCacheEntry; - -#define LAYOUTCACHE_ENTRIES 7 - -typedef struct TTLayoutTableCache { - TTLayoutTableCacheEntry entries[LAYOUTCACHE_ENTRIES]; - void* kernPairs; -} TTLayoutTableCache; - #include "sunfontids.h" -JNIEXPORT extern TTLayoutTableCache* newLayoutTableCache(); -JNIEXPORT extern void freeLayoutTableCache(TTLayoutTableCache* ltc); - /* If font is malformed then scaler context created by particular scaler * will be replaced by null scaler context. * Note that this context is not compatible with structure of the context