[psaux] Correctly handle Flex features (#52846).

* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO, cf2_cmdHMOVETO>: Do not move if doing Flex.
7 years ago · cc2f3cdecf
parent 3f96c0bcc1
commit cc2f3cdecf
2 changed files with 11 additions and 2 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2018-01-10  Ewald Hew  <ewaldhew@gmail.com>
+
+	[psaux] Correctly handle Flex features (#52846).
+
+	* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
+	cf2_cmdHMOVETO>: Do not move if doing Flex.
+
 2018-01-09  Alexei Podtelezhnikov  <apodtele@gmail.com>

 	* builds/windows/vc2010/freetype.sln: Synchronize with the project.
--- 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;