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

[os2] Make newer table fields accessible (#1452)

This commit is contained in:
Ebrahim Byagowi 2018-12-05 15:23:41 +03:30 committed by GitHub
parent 5ab086ebb1
commit 8394a6cb25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/hb-ot-os2-table.hh
View File

@ -30,7 +30,7 @@
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-ot-os2-unicode-ranges.hh" #include "hb-ot-os2-unicode-ranges.hh"
namespace OT { #include "hb-set.hh"
/* /*
* OS/2 and Windows Metrics * OS/2 and Windows Metrics
@ -38,16 +38,65 @@ namespace OT {
*/ */
#define HB_OT_TAG_OS2 HB_TAG('O','S','/','2') #define HB_OT_TAG_OS2 HB_TAG('O','S','/','2')
struct OS2
{
enum { tableTag = HB_OT_TAG_OS2 };
namespace OT {
struct OS2V1Tail
{
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this)); return_trace (c->check_struct (this));
} }
public:
HBUINT32 ulCodePageRange1;
HBUINT32 ulCodePageRange2;
public:
DEFINE_SIZE_STATIC (8);
};
struct OS2V2Tail
{
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this));
}
public:
HBINT16 sxHeight;
HBINT16 sCapHeight;
HBUINT16 usDefaultChar;
HBUINT16 usBreakChar;
HBUINT16 usMaxContext;
public:
DEFINE_SIZE_STATIC (10);
};
struct OS2V5Tail
{
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this));
}
public:
HBUINT16 usLowerOpticalPointSize;
HBUINT16 usUpperOpticalPointSize;
public:
DEFINE_SIZE_STATIC (4);
};
struct OS2
{
enum { tableTag = HB_OT_TAG_OS2 };
inline const OS2V1Tail &v1 (void) const { return version >= 1 ? v1X : Null (OS2V1Tail); }
inline const OS2V2Tail &v2 (void) const { return version >= 2 ? v2X : Null (OS2V2Tail); }
inline const OS2V5Tail &v5 (void) const { return version >= 5 ? v5X : Null (OS2V5Tail); }
inline bool subset (hb_subset_plan_t *plan) const inline bool subset (hb_subset_plan_t *plan) const
{ {
hb_blob_t *os2_blob = hb_sanitize_context_t ().reference_table<OS2> (plan->source); hb_blob_t *os2_blob = hb_sanitize_context_t ().reference_table<OS2> (plan->source);
@ -125,10 +174,18 @@ struct OS2
return (font_page_t) (fsSelection & 0xFF00); return (font_page_t) (fsSelection & 0xFF00);
} }
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
if (unlikely (!c->check_struct (this))) return_trace (false);
if (unlikely (version >= 1 && !v1X.sanitize (c))) return_trace (false);
if (unlikely (version >= 2 && !v2X.sanitize (c))) return_trace (false);
if (unlikely (version >= 5 && !v5X.sanitize (c))) return_trace (false);
return_trace (true);
}
public: public:
HBUINT16 version; HBUINT16 version;
/* Version 0 */
HBINT16 xAvgCharWidth; HBINT16 xAvgCharWidth;
HBUINT16 usWeightClass; HBUINT16 usWeightClass;
HBUINT16 usWidthClass; HBUINT16 usWidthClass;
@ -155,24 +212,11 @@ struct OS2
HBINT16 sTypoLineGap; HBINT16 sTypoLineGap;
HBUINT16 usWinAscent; HBUINT16 usWinAscent;
HBUINT16 usWinDescent; HBUINT16 usWinDescent;
OS2V1Tail v1X;
/* Version 1 */ OS2V2Tail v2X;
//HBUINT32 ulCodePageRange1; OS2V5Tail v5X;
//HBUINT32 ulCodePageRange2;
/* Version 2 */
//HBINT16 sxHeight;
//HBINT16 sCapHeight;
//HBUINT16 usDefaultChar;
//HBUINT16 usBreakChar;
//HBUINT16 usMaxContext;
/* Version 5 */
//HBUINT16 usLowerOpticalPointSize;
//HBUINT16 usUpperOpticalPointSize;
public: public:
DEFINE_SIZE_STATIC (78); DEFINE_SIZE_MIN (78);
}; };
} /* namespace OT */ } /* namespace OT */