aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/gxvalid/gxvmort0.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 08:30:47 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 08:30:47 +0200
commitd8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c (patch)
tree199776414c3aa9aab0a35c1d16d38c7a072d6665 /freetype/src/gxvalid/gxvmort0.c
parent7723537ddbe5dd4070f2bebbd4e0c93be3244b18 (diff)
downloadvcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.tar.gz
vcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.tar.bz2
vcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.zip
Switched to freetype 2.4.5
Diffstat (limited to 'freetype/src/gxvalid/gxvmort0.c')
-rw-r--r--freetype/src/gxvalid/gxvmort0.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/freetype/src/gxvalid/gxvmort0.c b/freetype/src/gxvalid/gxvmort0.c
index 0453062f6..b136ceda2 100644
--- a/freetype/src/gxvalid/gxvmort0.c
+++ b/freetype/src/gxvalid/gxvmort0.c
@@ -98,10 +98,24 @@
GXV_TRACE(( " %02d", verb ));
GXV_TRACE(( " %s\n", GXV_Mort_IndicScript_Msg[verb] ));
+ if ( markFirst > 0 && markLast > 0 )
+ {
+ GXV_TRACE(( " [odd] a glyph is marked as the first and last"
+ " in Indic rearrangement\n" ));
+ GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
+ }
+
+ if ( markFirst > 0 && dontAdvance > 0 )
+ {
+ GXV_TRACE(( " [odd] the first glyph is marked as dontAdvance"
+ " in Indic rearrangement\n" ));
+ GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
+ }
+
if ( 0 < reserved )
{
GXV_TRACE(( " non-zero bits found in reserved range\n" ));
- FT_INVALID_DATA;
+ GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
}
else
GXV_TRACE(( "\n" ));