From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001 From: Ewald Hew Date: Wed, 10 Jan 2018 13:24:56 +0800 Subject: [PATCH] [psaux] Correctly handle Flex features (#52846). * src/psaux/psintrp.c (cf2_interpT2CharString) : Do not move if doing Flex. --- ChangeLog | 7 +++++++ src/psaux/psintrp.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 134340189..96359ee80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-01-10 Ewald Hew + + [psaux] Correctly handle Flex features (#52846). + + * src/psaux/psintrp.c (cf2_interpT2CharString) : Do not move if doing Flex. + 2018-01-09 Alexei Podtelezhnikov * builds/windows/vc2010/freetype.sln: Synchronize with the project. diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c index 5c0ee7849..da5a8dad1 100644 --- a/src/psaux/psintrp.c +++ b/src/psaux/psintrp.c @@ -852,7 +852,8 @@ curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) ); - cf2_glyphpath_moveTo( &glyphPath, curX, curY ); + if ( !decoder->flex_state ) + cf2_glyphpath_moveTo( &glyphPath, curX, curY ); break; @@ -2674,7 +2675,8 @@ curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) ); - cf2_glyphpath_moveTo( &glyphPath, curX, curY ); + if ( !decoder->flex_state ) + cf2_glyphpath_moveTo( &glyphPath, curX, curY ); break;