37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
|
|
From: Ewald Hew <ewaldhew@gmail.com>
|
|
Date: Wed, 10 Jan 2018 13:24:56 +0800
|
|
Subject: [psaux] Correctly handle Flex features (#52846).
|
|
|
|
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
|
|
cf2_cmdHMOVETO>: Do not move if doing Flex.
|
|
---
|
|
ChangeLog | 7 +++++++
|
|
src/psaux/psintrp.c | 6 ++++--
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
Index: freetype-2.9/src/psaux/psintrp.c
|
|
===================================================================
|
|
--- freetype-2.9.orig/src/psaux/psintrp.c
|
|
+++ freetype-2.9/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;
|
|
|