[base,cff,cid] Whitespace, formatting.

5 files changed, 23 insertions, 24 deletions

diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 419cdfdcb..340de9c06 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -744,8 +744,8 @@
                     const void*  value,
                     FT_Bool      value_is_string )
   {
-    FT_Error    error  = FT_Err_Ok;
-    PS_Driver   driver = (PS_Driver)module;
+    FT_Error   error  = FT_Err_Ok;
+    PS_Driver  driver = (PS_Driver)module;
 
 #ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
     FT_UNUSED( value_is_string );
@@ -910,8 +910,8 @@
                     const char*  property_name,
                     const void*  value )
   {
-    FT_Error    error  = FT_Err_Ok;
-    PS_Driver   driver = (PS_Driver)module;
+    FT_Error   error  = FT_Err_Ok;
+    PS_Driver  driver = (PS_Driver)module;
 
 
     if ( !ft_strcmp( property_name, "darkening-parameters" ) )
@@ -1099,13 +1099,14 @@
   FT_DEFINE_SERVICE_CFFLOADREC(
     cff_service_cff_load,
 
-    (FT_Get_Standard_Encoding_Func) cff_get_standard_encoding,
-    (FT_Load_Private_Dict_Func)     cff_load_private_dict,
-    (FT_FD_Select_Get_Func)         cff_fd_select_get,
-    (FT_Blend_Check_Vector_Func)    cff_blend_check_vector,
-    (FT_Blend_Build_Vector_Func)    cff_blend_build_vector
+    (FT_Get_Standard_Encoding_Func)cff_get_standard_encoding,
+    (FT_Load_Private_Dict_Func)    cff_load_private_dict,
+    (FT_FD_Select_Get_Func)        cff_fd_select_get,
+    (FT_Blend_Check_Vector_Func)   cff_blend_check_vector,
+    (FT_Blend_Build_Vector_Func)   cff_blend_build_vector
   )
 
+
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 9a2080b21..5429460cc 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -145,6 +145,7 @@
     PSAux_Service            psaux         = (PSAux_Service)face->psaux;
     const CFF_Decoder_Funcs  decoder_funcs = psaux->cff_decoder_funcs;
 
+
     *max_advance = 0;
 
     /* Initialize load decoder */
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 21dd42366..0875ead7f 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -2097,7 +2097,8 @@
           do
           {
             face->root.internal->random_seed =
-              (FT_Int32)psaux->cff_random( (FT_UInt32)face->root.internal->random_seed );
+              (FT_Int32)psaux->cff_random(
+                (FT_UInt32)face->root.internal->random_seed );
 
           } while ( face->root.internal->random_seed < 0 );
         }
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 29a14f954..c794d3239 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -504,8 +504,8 @@
     FT_Library          library     = cffface->driver->root.library;
 
 
-    sfnt = (SFNT_Service)FT_Get_Module_Interface(
-             library, "sfnt" );
+    sfnt = (SFNT_Service)FT_Get_Module_Interface( library,
+                                                  "sfnt" );
     if ( !sfnt )
     {
       FT_ERROR(( "cff_face_init: cannot access `sfnt' module\n" ));
@@ -515,11 +515,11 @@
 
     FT_FACE_FIND_GLOBAL_SERVICE( face, psnames, POSTSCRIPT_CMAPS );
 
-    pshinter = (PSHinter_Service)FT_Get_Module_Interface(
-                 library, "pshinter" );
+    pshinter = (PSHinter_Service)FT_Get_Module_Interface( library,
+                                                          "pshinter" );
 
-    psaux = (PSAux_Service)FT_Get_Module_Interface(
-              library, "psaux" );
+    psaux = (PSAux_Service)FT_Get_Module_Interface( library,
+                                                    "psaux" );
     if ( !psaux )
     {
       FT_ERROR(( "cff_face_init: cannot access `psaux' module\n" ));
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 888b2d5d9..e4e2bcd0b 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -1303,12 +1303,11 @@
     PSAux_Service  psaux;
 #endif
 
-
     FT_Byte*    p       = start;
     FT_Error    error   = FT_Err_Ok;
     FT_Library  library = parser->library;
-    FT_UNUSED( library );
 
+    FT_UNUSED( library );
 
 
     parser->top    = parser->stack;
@@ -1394,8 +1393,7 @@
         cff_rec.top_font.font_dict.num_axes    = parser->num_axes;
         decoder.cff                            = &cff_rec;
 
-        psaux = (PSAux_Service)FT_Get_Module_Interface(
-                  library, "psaux" );
+        psaux = (PSAux_Service)FT_Get_Module_Interface( library, "psaux" );
         if ( !psaux )
         {
           FT_ERROR(( "cff_parser_run: cannot access `psaux' module\n" ));
@@ -1403,10 +1401,8 @@
           goto Exit;
         }
 
-        error = psaux->cff_decoder_funcs->parse_charstrings_old( &decoder,
-                                                                 charstring_base,
-                                                                 charstring_len,
-                                                                 1 );
+        error = psaux->cff_decoder_funcs->parse_charstrings_old(
+                  &decoder, charstring_base, charstring_len, 1 );
 
         /* Now copy the stack data in the temporary decoder object,    */
         /* converting it back to charstring number representations     */