summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/freetype/src/otvalid/otvmath.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/freetype/src/otvalid/otvmath.c')
-rw-r--r--src/3rdparty/freetype/src/otvalid/otvmath.c75
1 files changed, 38 insertions, 37 deletions
diff --git a/src/3rdparty/freetype/src/otvalid/otvmath.c b/src/3rdparty/freetype/src/otvalid/otvmath.c
index 50ed10cf28..d1791f8deb 100644
--- a/src/3rdparty/freetype/src/otvalid/otvmath.c
+++ b/src/3rdparty/freetype/src/otvalid/otvmath.c
@@ -44,7 +44,7 @@
static void
otv_MathConstants_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt i;
@@ -66,7 +66,7 @@
OTV_OPTIONAL_OFFSET( DeviceTableOffset );
OTV_SIZE_CHECK( DeviceTableOffset );
if ( DeviceTableOffset )
- otv_Device_validate( table + DeviceTableOffset, valid );
+ otv_Device_validate( table + DeviceTableOffset, otvalid );
}
OTV_EXIT;
@@ -84,7 +84,7 @@
static void
otv_MathItalicsCorrectionInfo_validate( FT_Bytes table,
- OTV_Validator valid,
+ OTV_Validator otvalid,
FT_Int isItalic )
{
FT_Bytes p = table;
@@ -108,7 +108,7 @@
table_size = 4 + 4 * cnt;
OTV_SIZE_CHECK( Coverage );
- otv_Coverage_validate( table + Coverage, valid, cnt );
+ otv_Coverage_validate( table + Coverage, otvalid, cnt );
for ( i = 0; i < cnt; ++i )
{
@@ -116,7 +116,7 @@
OTV_OPTIONAL_OFFSET( DeviceTableOffset );
OTV_SIZE_CHECK( DeviceTableOffset );
if ( DeviceTableOffset )
- otv_Device_validate( table + DeviceTableOffset, valid );
+ otv_Device_validate( table + DeviceTableOffset, otvalid );
}
OTV_EXIT;
@@ -133,7 +133,7 @@
static void
otv_MathKern_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt i, cnt, table_size;
@@ -157,7 +157,7 @@
OTV_OPTIONAL_OFFSET( DeviceTableOffset );
OTV_SIZE_CHECK( DeviceTableOffset );
if ( DeviceTableOffset )
- otv_Device_validate( table + DeviceTableOffset, valid );
+ otv_Device_validate( table + DeviceTableOffset, otvalid );
}
/* One more Kerning value */
@@ -167,7 +167,7 @@
OTV_OPTIONAL_OFFSET( DeviceTableOffset );
OTV_SIZE_CHECK( DeviceTableOffset );
if ( DeviceTableOffset )
- otv_Device_validate( table + DeviceTableOffset, valid );
+ otv_Device_validate( table + DeviceTableOffset, otvalid );
}
OTV_EXIT;
@@ -176,7 +176,7 @@
static void
otv_MathKernInfo_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt i, j, cnt, table_size;
@@ -196,7 +196,7 @@
table_size = 4 + 8 * cnt;
OTV_SIZE_CHECK( Coverage );
- otv_Coverage_validate( table + Coverage, valid, cnt );
+ otv_Coverage_validate( table + Coverage, otvalid, cnt );
for ( i = 0; i < cnt; ++i )
{
@@ -205,7 +205,7 @@
OTV_OPTIONAL_OFFSET( MKRecordOffset );
OTV_SIZE_CHECK( MKRecordOffset );
if ( MKRecordOffset )
- otv_MathKern_validate( table + MKRecordOffset, valid );
+ otv_MathKern_validate( table + MKRecordOffset, otvalid );
}
}
@@ -223,7 +223,7 @@
static void
otv_MathGlyphInfo_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt MathItalicsCorrectionInfo, MathTopAccentAttachment;
@@ -241,21 +241,22 @@
if ( MathItalicsCorrectionInfo )
otv_MathItalicsCorrectionInfo_validate(
- table + MathItalicsCorrectionInfo, valid, TRUE );
+ table + MathItalicsCorrectionInfo, otvalid, TRUE );
/* Italic correction and Top Accent Attachment have the same format */
if ( MathTopAccentAttachment )
otv_MathItalicsCorrectionInfo_validate(
- table + MathTopAccentAttachment, valid, FALSE );
+ table + MathTopAccentAttachment, otvalid, FALSE );
- if ( ExtendedShapeCoverage ) {
+ if ( ExtendedShapeCoverage )
+ {
OTV_NAME_ENTER( "ExtendedShapeCoverage" );
- otv_Coverage_validate( table + ExtendedShapeCoverage, valid, -1 );
+ otv_Coverage_validate( table + ExtendedShapeCoverage, otvalid, -1 );
OTV_EXIT;
}
if ( MathKernInfo )
- otv_MathKernInfo_validate( table + MathKernInfo, valid );
+ otv_MathKernInfo_validate( table + MathKernInfo, otvalid );
OTV_EXIT;
}
@@ -271,7 +272,7 @@
static void
otv_GlyphAssembly_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt pcnt, table_size;
@@ -293,7 +294,7 @@
OTV_SIZE_CHECK( DeviceTableOffset );
if ( DeviceTableOffset )
- otv_Device_validate( table + DeviceTableOffset, valid );
+ otv_Device_validate( table + DeviceTableOffset, otvalid );
for ( i = 0; i < pcnt; ++i )
{
@@ -301,7 +302,7 @@
gid = FT_NEXT_USHORT( p );
- if ( gid >= valid->glyph_count )
+ if ( gid >= otvalid->glyph_count )
FT_INVALID_GLYPH_ID;
p += 2*4; /* skip the Start, End, Full, and Flags fields */
}
@@ -312,7 +313,7 @@
static void
otv_MathGlyphConstruction_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt vcnt, table_size;
@@ -337,14 +338,14 @@
gid = FT_NEXT_USHORT( p );
- if ( gid >= valid->glyph_count )
+ if ( gid >= otvalid->glyph_count )
FT_INVALID_GLYPH_ID;
p += 2; /* skip the size */
}
OTV_SIZE_CHECK( GlyphAssembly );
if ( GlyphAssembly )
- otv_GlyphAssembly_validate( table+GlyphAssembly, valid );
+ otv_GlyphAssembly_validate( table+GlyphAssembly, otvalid );
/* OTV_EXIT; */
}
@@ -352,7 +353,7 @@
static void
otv_MathVariants_validate( FT_Bytes table,
- OTV_Validator valid )
+ OTV_Validator otvalid )
{
FT_Bytes p = table;
FT_UInt vcnt, hcnt, i, table_size;
@@ -377,24 +378,24 @@
OTV_SIZE_CHECK( VCoverage );
if ( VCoverage )
- otv_Coverage_validate( table + VCoverage, valid, vcnt );
+ otv_Coverage_validate( table + VCoverage, otvalid, vcnt );
OTV_SIZE_CHECK( HCoverage );
if ( HCoverage )
- otv_Coverage_validate( table + HCoverage, valid, hcnt );
+ otv_Coverage_validate( table + HCoverage, otvalid, hcnt );
for ( i = 0; i < vcnt; ++i )
{
OTV_OPTIONAL_OFFSET( Offset );
OTV_SIZE_CHECK( Offset );
- otv_MathGlyphConstruction_validate( table + Offset, valid );
+ otv_MathGlyphConstruction_validate( table + Offset, otvalid );
}
for ( i = 0; i < hcnt; ++i )
{
OTV_OPTIONAL_OFFSET( Offset );
OTV_SIZE_CHECK( Offset );
- otv_MathGlyphConstruction_validate( table + Offset, valid );
+ otv_MathGlyphConstruction_validate( table + Offset, otvalid );
}
OTV_EXIT;
@@ -409,20 +410,20 @@
/*************************************************************************/
/*************************************************************************/
- /* sets valid->glyph_count */
+ /* sets otvalid->glyph_count */
FT_LOCAL_DEF( void )
otv_MATH_validate( FT_Bytes table,
FT_UInt glyph_count,
FT_Validator ftvalid )
{
- OTV_ValidatorRec validrec;
- OTV_Validator valid = &validrec;
- FT_Bytes p = table;
+ OTV_ValidatorRec otvalidrec;
+ OTV_Validator otvalid = &otvalidrec;
+ FT_Bytes p = table;
FT_UInt MathConstants, MathGlyphInfo, MathVariants;
- valid->root = ftvalid;
+ otvalid->root = ftvalid;
FT_TRACE3(( "validating MATH table\n" ));
OTV_INIT;
@@ -436,14 +437,14 @@
MathGlyphInfo = FT_NEXT_USHORT( p );
MathVariants = FT_NEXT_USHORT( p );
- valid->glyph_count = glyph_count;
+ otvalid->glyph_count = glyph_count;
otv_MathConstants_validate( table + MathConstants,
- valid );
+ otvalid );
otv_MathGlyphInfo_validate( table + MathGlyphInfo,
- valid );
+ otvalid );
otv_MathVariants_validate ( table + MathVariants,
- valid );
+ otvalid );
FT_TRACE4(( "\n" ));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 13:12:23 +0000