summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/freetype/src/gxvalid/gxvmort0.c
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 14:40:25 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 14:40:26 +0200
commit814f713f01a459b48b12a3695fb1242b7d687662 (patch)
tree571598012909d82d15aca670cd9be22823596ad6 /src/3rdparty/freetype/src/gxvalid/gxvmort0.c
parent52ebf1f1914cea563b52baffc607407dbc6a7313 (diff)
parent448c3e85dddbfc5c101aceeeceb8584a3d41c913 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/3rdparty/freetype/src/gxvalid/gxvmort0.c')
-rw-r--r--src/3rdparty/freetype/src/gxvalid/gxvmort0.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/freetype/src/gxvalid/gxvmort0.c b/src/3rdparty/freetype/src/gxvalid/gxvmort0.c
index 0902056c62..0453062f63 100644
--- a/src/3rdparty/freetype/src/gxvalid/gxvmort0.c
+++ b/src/3rdparty/freetype/src/gxvalid/gxvmort0.c
@@ -64,7 +64,7 @@
gxv_mort_subtable_type0_entry_validate(
FT_Byte state,
FT_UShort flags,
- GXV_StateTable_GlyphOffsetDesc glyphOffset,
+ GXV_StateTable_GlyphOffsetCPtr glyphOffset_p,
FT_Bytes table,
FT_Bytes limit,
GXV_Validator valid )
@@ -80,7 +80,7 @@
FT_UNUSED( limit );
FT_UNUSED( GXV_Mort_IndicScript_Msg[verb] ); /* for the non-debugging */
- FT_UNUSED( glyphOffset ); /* case */
+ FT_UNUSED( glyphOffset_p ); /* case */
markFirst = (FT_UShort)( ( flags >> 15 ) & 1 );
@@ -91,7 +91,7 @@
verb = (FT_UShort)( flags & 0x000F );
GXV_TRACE(( " IndicScript MorphRule for glyphOffset 0x%04x",
- glyphOffset.u ));
+ glyphOffset_p->u ));
GXV_TRACE(( " markFirst=%01d", markFirst ));
GXV_TRACE(( " dontAdvance=%01d", dontAdvance ));
GXV_TRACE(( " markLast=%01d", markLast ));