summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/freetype/src/otvalid/otvjstf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/freetype/src/otvalid/otvjstf.c')
-rw-r--r--src/3rdparty/freetype/src/otvalid/otvjstf.c83
1 files changed, 42 insertions, 41 deletions
diff --git a/src/3rdparty/freetype/src/otvalid/otvjstf.c b/src/3rdparty/freetype/src/otvalid/otvjstf.c
index a616a23432..f273be8bbc 100644
--- a/src/3rdparty/freetype/src/otvalid/otvjstf.c
+++ b/src/3rdparty/freetype/src/otvalid/otvjstf.c
@@ -34,13 +34,13 @@
#define JstfPriorityFunc otv_JstfPriority_validate
#define JstfLookupFunc otv_GPOS_subtable_validate
- /* uses valid->extra1 (GSUB lookup count) */
- /* uses valid->extra2 (GPOS lookup count) */
- /* sets valid->extra1 (counter) */
+ /* uses otvalid->extra1 (GSUB lookup count) */
+ /* uses otvalid->extra2 (GPOS lookup count) */
+ /* sets otvalid->extra1 (counter) */
static void
otv_JstfPriority_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt table_size;
@@ -63,34 +63,34 @@
OTV_LIMIT_CHECK( 20 );
- gsub_lookup_count = valid->extra1;
- gpos_lookup_count = valid->extra2;
+ gsub_lookup_count = otvalid->extra1;
+ gpos_lookup_count = otvalid->extra2;
table_size = 20;
- valid->extra1 = gsub_lookup_count;
+ otvalid->extra1 = gsub_lookup_count;
OTV_OPTIONAL_OFFSET( ShrinkageEnableGSUB );
OTV_SIZE_CHECK( ShrinkageEnableGSUB );
if ( ShrinkageEnableGSUB )
- otv_x_ux( table + ShrinkageEnableGSUB, valid );
+ otv_x_ux( table + ShrinkageEnableGSUB, otvalid );
OTV_OPTIONAL_OFFSET( ShrinkageDisableGSUB );
OTV_SIZE_CHECK( ShrinkageDisableGSUB );
if ( ShrinkageDisableGSUB )
- otv_x_ux( table + ShrinkageDisableGSUB, valid );
+ otv_x_ux( table + ShrinkageDisableGSUB, otvalid );
- valid->extra1 = gpos_lookup_count;
+ otvalid->extra1 = gpos_lookup_count;
OTV_OPTIONAL_OFFSET( ShrinkageEnableGPOS );
OTV_SIZE_CHECK( ShrinkageEnableGPOS );
if ( ShrinkageEnableGPOS )
- otv_x_ux( table + ShrinkageEnableGPOS, valid );
+ otv_x_ux( table + ShrinkageEnableGPOS, otvalid );
OTV_OPTIONAL_OFFSET( ShrinkageDisableGPOS );
OTV_SIZE_CHECK( ShrinkageDisableGPOS );
if ( ShrinkageDisableGPOS )
- otv_x_ux( table + ShrinkageDisableGPOS, valid );
+ otv_x_ux( table + ShrinkageDisableGPOS, otvalid );
OTV_OPTIONAL_OFFSET( ShrinkageJstfMax );
OTV_SIZE_CHECK( ShrinkageJstfMax );
@@ -98,32 +98,32 @@
{
/* XXX: check lookup types? */
OTV_NEST2( JstfMax, JstfLookup );
- OTV_RUN( table + ShrinkageJstfMax, valid );
+ OTV_RUN( table + ShrinkageJstfMax, otvalid );
}
- valid->extra1 = gsub_lookup_count;
+ otvalid->extra1 = gsub_lookup_count;
OTV_OPTIONAL_OFFSET( ExtensionEnableGSUB );
OTV_SIZE_CHECK( ExtensionEnableGSUB );
if ( ExtensionEnableGSUB )
- otv_x_ux( table + ExtensionEnableGSUB, valid );
+ otv_x_ux( table + ExtensionEnableGSUB, otvalid );
OTV_OPTIONAL_OFFSET( ExtensionDisableGSUB );
OTV_SIZE_CHECK( ExtensionDisableGSUB );
if ( ExtensionDisableGSUB )
- otv_x_ux( table + ExtensionDisableGSUB, valid );
+ otv_x_ux( table + ExtensionDisableGSUB, otvalid );
- valid->extra1 = gpos_lookup_count;
+ otvalid->extra1 = gpos_lookup_count;
OTV_OPTIONAL_OFFSET( ExtensionEnableGPOS );
OTV_SIZE_CHECK( ExtensionEnableGPOS );
if ( ExtensionEnableGPOS )
- otv_x_ux( table + ExtensionEnableGPOS, valid );
+ otv_x_ux( table + ExtensionEnableGPOS, otvalid );
OTV_OPTIONAL_OFFSET( ExtensionDisableGPOS );
OTV_SIZE_CHECK( ExtensionDisableGPOS );
if ( ExtensionDisableGPOS )
- otv_x_ux( table + ExtensionDisableGPOS, valid );
+ otv_x_ux( table + ExtensionDisableGPOS, otvalid );
OTV_OPTIONAL_OFFSET( ExtensionJstfMax );
OTV_SIZE_CHECK( ExtensionJstfMax );
@@ -131,22 +131,22 @@
{
/* XXX: check lookup types? */
OTV_NEST2( JstfMax, JstfLookup );
- OTV_RUN( table + ExtensionJstfMax, valid );
+ OTV_RUN( table + ExtensionJstfMax, otvalid );
}
- valid->extra1 = gsub_lookup_count;
- valid->extra2 = gpos_lookup_count;
+ otvalid->extra1 = gsub_lookup_count;
+ otvalid->extra2 = gpos_lookup_count;
OTV_EXIT;
}
- /* sets valid->extra (glyph count) */
- /* sets valid->func1 (otv_JstfPriority_validate) */
+ /* sets otvalid->extra (glyph count) */
+ /* sets otvalid->func1 (otv_JstfPriority_validate) */
static void
otv_JstfScript_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt table_size;
@@ -170,16 +170,16 @@
OTV_SIZE_CHECK( ExtGlyph );
if ( ExtGlyph )
{
- valid->extra1 = valid->glyph_count;
+ otvalid->extra1 = otvalid->glyph_count;
OTV_NEST1( ExtenderGlyph );
- OTV_RUN( table + ExtGlyph, valid );
+ OTV_RUN( table + ExtGlyph, otvalid );
}
OTV_SIZE_CHECK( DefJstfLangSys );
if ( DefJstfLangSys )
{
OTV_NEST2( JstfLangSys, JstfPriority );
- OTV_RUN( table + DefJstfLangSys, valid );
+ OTV_RUN( table + DefJstfLangSys, otvalid );
}
OTV_LIMIT_CHECK( 6 * JstfLangSysCount );
@@ -190,16 +190,16 @@
{
p += 4; /* skip JstfLangSysTag */
- OTV_RUN( table + FT_NEXT_USHORT( p ), valid );
+ OTV_RUN( table + FT_NEXT_USHORT( p ), otvalid );
}
OTV_EXIT;
}
- /* sets valid->extra1 (GSUB lookup count) */
- /* sets valid->extra2 (GPOS lookup count) */
- /* sets valid->glyph_count */
+ /* sets otvalid->extra1 (GSUB lookup count) */
+ /* sets otvalid->extra2 (GPOS lookup count) */
+ /* sets otvalid->glyph_count */
FT_LOCAL_DEF( void )
otv_JSTF_validate( FT_Bytes table,
@@ -208,13 +208,14 @@
FT_UInt glyph_count,
FT_Validator ftvalid )
{
- OTV_ValidatorRec validrec;
- OTV_Validator valid = &validrec;
+ OTV_ValidatorRec otvalidrec;
+ OTV_Validator otvalid = &otvalidrec;
FT_Bytes p = table;
FT_UInt JstfScriptCount;
- valid->root = ftvalid;
+ otvalid->root = ftvalid;
+
FT_TRACE3(( "validating JSTF table\n" ));
OTV_INIT;
@@ -231,16 +232,16 @@
OTV_LIMIT_CHECK( JstfScriptCount * 6 );
if ( gsub )
- valid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub );
+ otvalid->extra1 = otv_GSUBGPOS_get_Lookup_count( gsub );
else
- valid->extra1 = 0;
+ otvalid->extra1 = 0;
if ( gpos )
- valid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos );
+ otvalid->extra2 = otv_GSUBGPOS_get_Lookup_count( gpos );
else
- valid->extra2 = 0;
+ otvalid->extra2 = 0;
- valid->glyph_count = glyph_count;
+ otvalid->glyph_count = glyph_count;
/* JstfScriptRecord */
for ( ; JstfScriptCount > 0; JstfScriptCount-- )
@@ -248,7 +249,7 @@
p += 4; /* skip JstfScriptTag */
/* JstfScript */
- otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), valid );
+ otv_JstfScript_validate( table + FT_NEXT_USHORT( p ), otvalid );
}
FT_TRACE4(( "\n" ));
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 00:03:55 +0000