Update freetype to 2.5.4.

third_party/freetype/src/cff/cf2intrp.c

 /***************************************************************************/
 /*                                                                         */
 /*  cf2intrp.c                                                             */
 /*                                                                         */
 /*    Adobe's CFF Interpreter (body).                                      */
 /*                                                                         */
-/*  Copyright 2007-2013 Adobe Systems Incorporated.                        */
+/*  Copyright 2007-2014 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      */
 /*  herein (collectively, the "Work") is made available, and may only be   */
 /*  used, modified, and distributed under the FreeType Project License,    */
 /*  LICENSE.TXT.  Additionally, subject to the terms and conditions of the */
 /*  FreeType Project License, each contributor to the Work hereby grants   */
 /*  to any individual or legal entity exercising permissions granted by    */
 /*  the FreeType Project License and this section (hereafter, "You" or     */
 /*  "Your") a perpetual, worldwide, non-exclusive, no-charge,              */
@@ skipping 12 matching lines @@
 /*                                                                         */
 /*  By using, modifying, or distributing the Work you indicate that you    */
 /*  have read and understood the terms and conditions of the               */
 /*  FreeType Project License as well as those provided in this section,    */
 /*  and you accept them fully.                                             */
 /*                                                                         */
 /***************************************************************************/
 
 
 #include "cf2ft.h"
-#include "../../include/freetype/internal/ftdebug.h"
+#include FT_INTERNAL_DEBUG_H
 
 #include "cf2glue.h"
 #include "cf2font.h"
 #include "cf2stack.h"
 #include "cf2hints.h"
 
 #include "cf2error.h"
 
 
   /*************************************************************************/
@@ skipping 406 matching lines @@
 
     /* TODO: placeholders for hint structures */
 
     /* objects used for hinting */
     CF2_ArrStackRec  hStemHintArray;
     CF2_ArrStackRec  vStemHintArray;
 
     CF2_HintMaskRec   hintMask;
     CF2_GlyphPathRec  glyphPath;
 
+
     /* 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 108 matching lines @@
         /* we may get here if we have a prior error */
         FT_TRACE4(( " unknown op (%d)\n", op1 ));
         break;
 
       case cf2_cmdHSTEMHM:
       case cf2_cmdHSTEM:
         FT_TRACE4(( op1 == cf2_cmdHSTEMHM ? " hstemhm\n" : " hstem\n" ));
 
         /* never add hints after the mask is computed */
         if ( cf2_hintmask_isValid( &hintMask ) )
+        {
           FT_TRACE4(( "cf2_interpT2CharString:"
                       " invalid horizontal hint mask\n" ));
+          break;
+        }
 
         cf2_doStems( font,
                      opStack,
                      &hStemHintArray,
                      width,
                      &haveWidth,
                      0 );
 
         if ( font->decoder->width_only )
             goto exit;
 
         break;
 
       case cf2_cmdVSTEMHM:
       case cf2_cmdVSTEM:
         FT_TRACE4(( op1 == cf2_cmdVSTEMHM ? " vstemhm\n" : " vstem\n" ));
 
         /* never add hints after the mask is computed */
         if ( cf2_hintmask_isValid( &hintMask ) )
+        {
           FT_TRACE4(( "cf2_interpT2CharString:"
                       " invalid vertical hint mask\n" ));
+          break;
+        }
 
         cf2_doStems( font,
                      opStack,
                      &vStemHintArray,
                      width,
                      &haveWidth,
                      0 );
 
         if ( font->decoder->width_only )
             goto exit;
 
         break;
 
       case cf2_cmdVMOVETO:
         FT_TRACE4(( " vmoveto\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;
 
         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 391 matching lines @@
           cf2_freeSeacComponent( decoder, &component );
         }
         goto exit;
 
       case cf2_cmdCNTRMASK:
       case cf2_cmdHINTMASK:
         /* the final \n in the tracing message gets added in      */
         /* `cf2_hintmask_read' (which also traces the mask bytes) */
         FT_TRACE4(( op1 == cf2_cmdCNTRMASK ? " cntrmask" : " hintmask" ));
 
+        /* never add hints after the mask is computed */
+        if ( cf2_stack_count( opStack ) > 1    &&
+             cf2_hintmask_isValid( &hintMask ) )
+        {
+          FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
+          break;
+        }
+
         /* if there are arguments on the stack, there this is an */
         /* implied cf2_cmdVSTEMHM                                */
-        if ( cf2_stack_count( opStack ) != 0 )
-        {
-          /* never add hints after the mask is computed */
-          if ( cf2_hintmask_isValid( &hintMask ) )
-            FT_TRACE4(( "cf2_interpT2CharString: invalid hint mask\n" ));
-        }
-
         cf2_doStems( font,
                      opStack,
                      &vStemHintArray,
                      width,
                      &haveWidth,
                      0 );
 
         if ( font->decoder->width_only )
             goto exit;
 
@@ skipping 53 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 */