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

 /***************************************************************************/
 /*                                                                         */
 /*  cf2ft.c                                                                */
 /*                                                                         */
 /*    FreeType Glue Component to Adobe's Interpreter (body).               */
 /*                                                                         */
 /*  Copyright 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 125 matching lines @@
   }
 
 
   static void
   cf2_builder_lineTo( CF2_OutlineCallbacks      callbacks,
                       const CF2_CallbackParams  params )
   {
     /* downcast the object pointer */
     CF2_Outline   outline = (CF2_Outline)callbacks;
     CFF_Builder*  builder;
+        FT_Error          error;
 
 
     FT_ASSERT( outline && outline->decoder );
     FT_ASSERT( params->op == CF2_PathOpLineTo );
 
     builder = &outline->decoder->builder;
 
     if ( !builder->path_begun )
     {
       /* record the move before the line; also check points and set */
       /* `path_begun'                                               */
-      cff_builder_start_point( builder,
+                error = cff_builder_start_point(builder,
                                params->pt0.x,
                                params->pt0.y );
+                if (callbacks && callbacks->error) *callbacks->error = error;
+                if (error) return;
     }
 
     /* `cff_builder_add_point1' includes a check_points call for one point */
-    cff_builder_add_point1( builder,
+        error = cff_builder_add_point1(builder,
                             params->pt1.x,
                             params->pt1.y );
+        if (callbacks && callbacks->error) *callbacks->error = error;
   }
 
 
   static void
   cf2_builder_cubeTo( CF2_OutlineCallbacks      callbacks,
                       const CF2_CallbackParams  params )
   {
     /* downcast the object pointer */
     CF2_Outline   outline = (CF2_Outline)callbacks;
     CFF_Builder*  builder;
+        FT_Error          error;
 
 
     FT_ASSERT( outline && outline->decoder );
     FT_ASSERT( params->op == CF2_PathOpCubeTo );
 
     builder = &outline->decoder->builder;
 
     if ( !builder->path_begun )
     {
       /* record the move before the line; also check points and set */
       /* `path_begun'                                               */
-      cff_builder_start_point( builder,
+      error = cff_builder_start_point( builder,
                                params->pt0.x,
                                params->pt0.y );
+          if (callbacks && callbacks->error) *callbacks->error = error;
+          if (error) return;
     }
 
     /* prepare room for 3 points: 2 off-curve, 1 on-curve */
-    cff_check_points( builder, 3 );
+    error = cff_check_points( builder, 3 );
+        if (callbacks && callbacks->error) *callbacks->error = error;
+        if (error) return;
 
     cff_builder_add_point( builder,
                            params->pt1.x,
                            params->pt1.y, 0 );
     cff_builder_add_point( builder,
                            params->pt2.x,
                            params->pt2.y, 0 );
     cff_builder_add_point( builder,
                            params->pt3.x,
                            params->pt3.y, 1 );
@@ skipping 426 matching lines @@
 
     FT_ASSERT( decoder );
 
     cff_builder_close_contour( &decoder->builder );
 
     FT_GlyphLoader_Add( decoder->builder.loader );
   }
 
 
 /* END */