some fixes in order to be able to use freetype when compiled with ems…

…cripten
emscripten-ports · Aug 11, 2015 · 40a760c · 40a760c
1 parent e186230
commit 40a760c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/autofit/afdummy.c b/src/autofit/afdummy.c
@@ -39,10 +39,12 @@
 
   static FT_Error
   af_dummy_hints_apply( AF_GlyphHints  hints,
-                        FT_Outline*    outline )
+                        FT_Outline*    outline,
+                        AF_StyleMetrics metrics )
   {
     FT_Error  error;
 
+    FT_UNUSED(metrics);
 
     error = af_glyph_hints_reload( hints, outline );
     if ( !error )

diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
@@ -214,7 +214,7 @@ extern void*  _af_debug_hints;
   (*AF_WritingSystem_InitHintsFunc)( AF_GlyphHints    hints,
                                      AF_StyleMetrics  metrics );
 
-  typedef void
+  typedef FT_Error
   (*AF_WritingSystem_ApplyHintsFunc)( AF_GlyphHints    hints,
                                       FT_Outline*      outline,
                                       AF_StyleMetrics  metrics );

diff --git a/src/cid/cidload.c b/src/cid/cidload.c
@@ -146,7 +146,7 @@
   }
 
 
-  FT_CALLBACK_DEF( FT_Error )
+  FT_CALLBACK_DEF( void )
   cid_parse_font_matrix( CID_Face     face,
                          CID_Parser*  parser )
   {
@@ -169,15 +169,17 @@
 
       result = cid_parser_to_fixed_array( parser, 6, temp, 3 );
 
-      if ( result < 6 )
-        return FT_THROW( Invalid_File_Format );
+      if ( result < 6 ) {
+        FT_THROW( Invalid_File_Format );
+        return;
+      }
 
       temp_scale = FT_ABS( temp[3] );
 
       if ( temp_scale == 0 )
       {
         FT_ERROR(( "cid_parse_font_matrix: invalid font matrix\n" ));
-        return FT_THROW( Invalid_File_Format );
+        return;
       }
 
       /* Set Units per EM based on FontMatrix values.  We set the value to */
@@ -207,11 +209,10 @@
       offset->y  = temp[5] >> 16;
     }
 
-    return FT_Err_Ok;
   }
 
 
-  FT_CALLBACK_DEF( FT_Error )
+  FT_CALLBACK_DEF( void )
   parse_fd_array( CID_Face     face,
                   CID_Parser*  parser )
   {
@@ -251,15 +252,15 @@
     }
 
   Exit:
-    return error;
+    FT_UNUSED(error);
   }
 
 
   /* by mistake, `expansion_factor' appears both in PS_PrivateRec */
   /* and CID_FaceDictRec (both are public header files and can't  */
   /* changed); we simply copy the value                           */
 
-  FT_CALLBACK_DEF( FT_Error )
+  FT_CALLBACK_DEF( void )
   parse_expansion_factor( CID_Face     face,
                           CID_Parser*  parser )
   {
@@ -274,7 +275,6 @@
       dict->private_dict.expansion_factor = dict->expansion_factor;
     }
 
-    return FT_Err_Ok;
   }