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/cf2hints.c

 /***************************************************************************/
 /*                                                                         */
 /*  cf2hints.c                                                             */
 /*                                                                         */
 /*    Adobe's code for handling CFF hints (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 1567 matching lines @@
     /* construct offset points */
     P0.x = glyphpath->currentCS.x + xOffset;
     P0.y = glyphpath->currentCS.y + yOffset;
     P1.x = x + xOffset;
     P1.y = y + yOffset;
 
     if ( glyphpath->moveIsPending )
     {
       /* emit offset 1st point as MoveTo */
       cf2_glyphpath_pushMove( glyphpath, P0 );
+          if (glyphpath->callbacks && glyphpath->callbacks->error && *glyphpath->callbacks->error) return;
 
       glyphpath->moveIsPending = FALSE;  /* adjust state machine */
       glyphpath->pathIsOpen    = TRUE;
 
       glyphpath->offsetStart1 = P1;              /* record second point */
     }
 
     if ( glyphpath->elemIsQueued )
     {
       FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
 
       cf2_glyphpath_pushPrevElem( glyphpath,
                                   &glyphpath->hintMap,
                                   &P0,
                                   P1,
                                   FALSE );
+          if (glyphpath->callbacks && glyphpath->callbacks->error && *glyphpath->callbacks->error) return;
     }
 
     /* queue the current element with offset points */
     glyphpath->elemIsQueued = TRUE;
     glyphpath->prevElemOp   = CF2_PathOpLineTo;
     glyphpath->prevElemP0   = P0;
     glyphpath->prevElemP1   = P1;
 
     /* update current map */
     if ( cf2_hintmask_isNew( glyphpath->hintMask ) )
@@ skipping 50 matching lines @@
     /* note: preserve angle of final segment by using offset3 at both ends */
     P2.x = x2 + xOffset3;
     P2.y = y2 + yOffset3;
     P3.x = x3 + xOffset3;
     P3.y = y3 + yOffset3;
 
     if ( glyphpath->moveIsPending )
     {
       /* emit offset 1st point as MoveTo */
       cf2_glyphpath_pushMove( glyphpath, P0 );
+          if (glyphpath->callbacks && glyphpath->callbacks->error && *glyphpath->callbacks->error) return;
 
       glyphpath->moveIsPending = FALSE;
       glyphpath->pathIsOpen    = TRUE;
 
       glyphpath->offsetStart1 = P1;              /* record second point */
     }
 
     if ( glyphpath->elemIsQueued )
     {
       FT_ASSERT( cf2_hintmap_isValid( &glyphpath->hintMap ) );
 
       cf2_glyphpath_pushPrevElem( glyphpath,
                                   &glyphpath->hintMap,
                                   &P0,
                                   P1,
                                   FALSE );
+          if (glyphpath->callbacks && glyphpath->callbacks->error && *glyphpath->callbacks->error) return;
     }
 
     /* queue the current element with offset points */
     glyphpath->elemIsQueued = TRUE;
     glyphpath->prevElemOp   = CF2_PathOpCubeTo;
     glyphpath->prevElemP0   = P0;
     glyphpath->prevElemP1   = P1;
     glyphpath->prevElemP2   = P2;
     glyphpath->prevElemP3   = P3;
 
@@ skipping 16 matching lines @@
   {
     if ( glyphpath->pathIsOpen )
     {
       FT_ASSERT( cf2_hintmap_isValid( &glyphpath->firstHintMap ) );
 
       /* since we need to apply an offset to the implicit lineto, we make */
       /* it explicit here                                                 */
       cf2_glyphpath_lineTo( glyphpath,
                             glyphpath->start.x,
                             glyphpath->start.y );
+          if (glyphpath->callbacks && glyphpath->callbacks->error && *glyphpath->callbacks->error) return;
 
       /* Draw previous element (the explicit LineTo we just created,      */
       /* above) and connect it to the start point, but with the offset we */
       /* saved from the first element.                                    */
       /* Use the saved HintMap, too. */
       FT_ASSERT( glyphpath->elemIsQueued );
 
       cf2_glyphpath_pushPrevElem( glyphpath,
                                   &glyphpath->firstHintMap,
                                   &glyphpath->offsetStart0,
                                   glyphpath->offsetStart1,
                                   TRUE );
 
       /* reset state machine */
       glyphpath->moveIsPending = TRUE;
       glyphpath->pathIsOpen    = FALSE;
       glyphpath->elemIsQueued  = FALSE;
     }
   }
 
 
 /* END */