[freetype2] ewaldhew-wip 8452264 09/47: top check fix

[Hew Yih Shiuan Ewald]

branch: ewaldhew-wip
commit 8452264d0dff6094b422ffbf93a0181ee9088dbd
Author: Ewald Hew <address@hidden>
Commit: Ewald Hew <address@hidden>

    top check fix
---
 src/psaux/psintrp.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
index a44b334..a0e5771 100644
--- a/src/psaux/psintrp.c
+++ b/src/psaux/psintrp.c
@@ -641,23 +641,14 @@
 
       if ( font->isT1 )
       {
-        if ( unknown_othersubr_result_cnt > 0 )
+        if ( unknown_othersubr_result_cnt > 0 &&
+             !( op1 == cf2_cmdCALLSUBR ||
+                op1 == cf2_cmdRETURN   ||
+                op1 == cf2_escPOP      ||
+                op1 >= 32 /* Numbers */ ) )
         {
-          switch ( op1 )
-          {
-          case cf2_cmdCALLSUBR:
-          case cf2_cmdRETURN:
-          case cf2_cmdPOP:
-            break;
-
-          default:
-            if ( op1 >= 32 ) /* Numbers */
-              break;
-            
-            /* all operands have been transferred by previous pops */
-            unknown_othersubr_result_cnt = 0;
-            break;
-          }
+          /* all operands have been transferred by previous pops */
+          unknown_othersubr_result_cnt = 0;
         }
 
         if ( large_int && !( op1 >= 32 || op1 == cf2_escDIV ) )