Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters represe…

core/src/fxge/fx_freetype/fxft2.5.01/src/cff/cf2intrp.c

 /***************************************************************************/
 /*                                                                         */
 /*  cf2intrp.c                                                             */
 /*                                                                         */
 /*    Adobe's CFF Interpreter (body).                                      */
 /*                                                                         */
 /*  Copyright 2007-2013 Adobe Systems Incorporated.                        */
 /*                                                                         */
 /*  This software, and all works of authorship, whether in source or       */
 /*  object code form as indicated by the copyright notice(s) included      */
@@ skipping 446 matching lines @@
 
     /* TODO: placeholders for hint structures */
 
     /* objects used for hinting */
     CF2_ArrStackRec  hStemHintArray;
     CF2_ArrStackRec  vStemHintArray;
 
     CF2_HintMaskRec   hintMask;
     CF2_GlyphPathRec  glyphPath;
 
-        int refCount = 0;
-
-
     /* initialize the remaining objects */
     cf2_arrstack_init( &subrStack,
                        memory,
                        error,
                        sizeof ( CF2_BufferRec ) );
     cf2_arrstack_init( &hStemHintArray,
                        memory,
                        error,
                        sizeof ( CF2_StemHintRec ) );
     cf2_arrstack_init( &vStemHintArray,
@@ skipping 64 matching lines @@
     charstring  = (CF2_Buffer)cf2_arrstack_getBuffer( &subrStack );
     *charstring = *buf;    /* structure copy */
 
     charstringIndex = 0;       /* entry is valid now */
 
     /* catch errors so far */
     if ( *error )
       goto exit;
 
     /* main interpreter loop */
-    while ( refCount++ < 10240 )
+    while ( 1 )
     {
       if ( cf2_buf_isEnd( charstring ) )
       {
         /* If we've reached the end of the charstring, simulate a */
         /* cf2_cmdRETURN or cf2_cmdENDCHAR.                       */
         if ( charstringIndex )
           op1 = cf2_cmdRETURN;  /* end of buffer for subroutine */
         else
           op1 = cf2_cmdENDCHAR; /* end of buffer for top level charstring */
       }
@@ skipping 74 matching lines @@
 
         /* width is defined or default after this */
         haveWidth = TRUE;
 
         if ( font->decoder->width_only )
             goto exit;
 
         curY += cf2_stack_popFixed( opStack );
 
         cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+                if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
         break;
 
       case cf2_cmdRLINETO:
         {
           CF2_UInt  index;
           CF2_UInt  count = cf2_stack_count( opStack );
 
 
           FT_TRACE4(( " rlineto\n" ));
 
           for ( index = 0; index < count; index += 2 )
           {
             curX += cf2_stack_getReal( opStack, index + 0 );
             curY += cf2_stack_getReal( opStack, index + 1 );
 
             cf2_glyphpath_lineTo( &glyphPath, curX, curY );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
           }
 
           cf2_stack_clear( opStack );
         }
         continue; /* no need to clear stack again */
 
       case cf2_cmdHLINETO:
       case cf2_cmdVLINETO:
         {
           CF2_UInt  index;
@@ skipping 10 matching lines @@
 
 
             if ( isX )
               curX += v;
             else
               curY += v;
 
             isX = !isX;
 
             cf2_glyphpath_lineTo( &glyphPath, curX, curY );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
           }
 
           cf2_stack_clear( opStack );
         }
         continue;
 
       case cf2_cmdRCURVELINE:
       case cf2_cmdRRCURVETO:
         {
           CF2_UInt  count = cf2_stack_count( opStack );
           CF2_UInt  index = 0;
 
 
           FT_TRACE4(( op1 == cf2_cmdRCURVELINE ? " rcurveline\n"
                                                : " rrcurveto\n" ));
 
           while ( index + 6 <= count )
           {
             CF2_Fixed  x1 = cf2_stack_getReal( opStack, index + 0 ) + curX;
             CF2_Fixed  y1 = cf2_stack_getReal( opStack, index + 1 ) + curY;
             CF2_Fixed  x2 = cf2_stack_getReal( opStack, index + 2 ) + x1;
             CF2_Fixed  y2 = cf2_stack_getReal( opStack, index + 3 ) + y1;
             CF2_Fixed  x3 = cf2_stack_getReal( opStack, index + 4 ) + x2;
             CF2_Fixed  y3 = cf2_stack_getReal( opStack, index + 5 ) + y2;
 
 
             cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
             curX   = x3;
             curY   = y3;
             index += 6;
           }
 
           if ( op1 == cf2_cmdRCURVELINE )
           {
             curX += cf2_stack_getReal( opStack, index + 0 );
             curY += cf2_stack_getReal( opStack, index + 1 );
 
             cf2_glyphpath_lineTo( &glyphPath, curX, curY );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
           }
 
           cf2_stack_clear( opStack );
         }
         continue; /* no need to clear stack again */
 
       case cf2_cmdCALLGSUBR:
       case cf2_cmdCALLSUBR:
         {
           CF2_UInt  subrIndex;
@@ skipping 473 matching lines @@
         /* width is defined or default after this */
         haveWidth = TRUE;
 
         if ( font->decoder->width_only )
             goto exit;
 
         curY += cf2_stack_popFixed( opStack );
         curX += cf2_stack_popFixed( opStack );
 
         cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+                if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
         break;
 
       case cf2_cmdHMOVETO:
         FT_TRACE4(( " hmoveto\n" ));
 
         if ( cf2_stack_count( opStack ) > 1 && !haveWidth )
           *width = cf2_stack_getReal( opStack, 0 ) + nominalWidthX;
 
         /* width is defined or default after this */
         haveWidth = TRUE;
 
         if ( font->decoder->width_only )
             goto exit;
 
         curX += cf2_stack_popFixed( opStack );
 
         cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+                if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
         break;
 
       case cf2_cmdRLINECURVE:
         {
           CF2_UInt  count = cf2_stack_count( opStack );
           CF2_UInt  index = 0;
 
 
           FT_TRACE4(( " rlinecurve\n" ));
 
           while ( index + 6 < count )
           {
             curX += cf2_stack_getReal( opStack, index + 0 );
             curY += cf2_stack_getReal( opStack, index + 1 );
 
             cf2_glyphpath_lineTo( &glyphPath, curX, curY );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
             index += 2;
           }
 
           while ( index < count )
           {
             CF2_Fixed  x1 = cf2_stack_getReal( opStack, index + 0 ) + curX;
             CF2_Fixed  y1 = cf2_stack_getReal( opStack, index + 1 ) + curY;
             CF2_Fixed  x2 = cf2_stack_getReal( opStack, index + 2 ) + x1;
             CF2_Fixed  y2 = cf2_stack_getReal( opStack, index + 3 ) + y1;
             CF2_Fixed  x3 = cf2_stack_getReal( opStack, index + 4 ) + x2;
             CF2_Fixed  y3 = cf2_stack_getReal( opStack, index + 5 ) + y2;
 
 
             cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
             curX   = x3;
             curY   = y3;
             index += 6;
           }
 
           cf2_stack_clear( opStack );
         }
         continue; /* no need to clear stack again */
 
@@ skipping 19 matching lines @@
             else
               x1 = curX;
 
             y1 = cf2_stack_getReal( opStack, index + 0 ) + curY;
             x2 = cf2_stack_getReal( opStack, index + 1 ) + x1;
             y2 = cf2_stack_getReal( opStack, index + 2 ) + y1;
             x3 = x2;
             y3 = cf2_stack_getReal( opStack, index + 3 ) + y2;
 
             cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
             curX   = x3;
             curY   = y3;
             index += 4;
           }
 
           cf2_stack_clear( opStack );
         }
         continue; /* no need to clear stack again */
 
@@ skipping 19 matching lines @@
             else
               y1 = curY;
 
             x1 = cf2_stack_getReal( opStack, index + 0 ) + curX;
             x2 = cf2_stack_getReal( opStack, index + 1 ) + x1;
             y2 = cf2_stack_getReal( opStack, index + 2 ) + y1;
             x3 = cf2_stack_getReal( opStack, index + 3 ) + x2;
             y3 = y2;
 
             cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
             curX   = x3;
             curY   = y3;
             index += 4;
           }
 
           cf2_stack_clear( opStack );
         }
         continue; /* no need to clear stack again */
 
@@ skipping 46 matching lines @@
 
                 ++index;
               }
               else
                 y3 = y2;
 
               alternate = TRUE;
             }
 
             cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
+                        if (glyphPath.callbacks && glyphPath.callbacks->error && *glyphPath.callbacks->error) goto exit;
 
             curX   = x3;
             curY   = y3;
             index += 4;
           }
 
           cf2_stack_clear( opStack );
         }
         continue;     /* no need to clear stack again */
 
@@ skipping 100 matching lines @@
     cf2_arrstack_finalize( &subrStack );
     cf2_stack_free( opStack );
 
     FT_TRACE4(( "\n" ));
 
     return;
   }
 
 
 /* END */