* README: Formatting.

* Jamfile: Fix typo.

* src/cff/cffparse.c: Move error code #defines to...
* include/freetype/internal/cfferrs.h: This file.
* src/cff/cffdrivr.c, src/cff/cffobjs.c, src/cff/cffload.c: Replaced
`FT_Err_*' with `CFF_Err_*'.
* src/cid/cidparse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* src/psaux/psobjs.c, src/psaux/t1decode.c: Ditto.
* src/sfnt/sfobcs.c, src/sfnt/ttload.c: Replaced `FT_Err_*' with
`TT_Err_*'.
* src/truetype/ttgload.c, src/truetype/ttobjs.c: Ditto.
* src/type1/t1gload.c, src/type1/t1load.c, src/type1/t1objs.c,
src/type1/t1parse.c: Replaced `FT_Err_*' with `T1_Err_*'.

* include/freetype/internal/cfferrs.h: Add
`CFF_Err_Unknown_File_Format'.
* include/freetype/internal/t1errors.h: Add
`T1_Err_Unknown_File_Format'.
* include/freetype/internal/tterrors.h: Add
`TT_Err_Unknown_File_Format'.

* src/cff/cffload.h: Add `cff_*_encoding' and `cff_*_charset'
references.
* src/psaux/psobjs.c: Include `FT_INTERNAL_TYPE1_ERRORS_H'.

* src/cff/cffobjs.c (CFF_Init_Face, CFF_Done_Face): Use
FT_LOCAL_DEF.
* src/cid/cidobjs.c (CID_Done_Driver): Ditto.
* src/trutype/ttobjs.c (TT_Init_Face, TT_Done_Face, TT_Init_Size):
Ditto.
* src/type1/t1objs.c (T1_Done_Driver): Ditto.
* src/pcf/pcfdriver.c (PCF_Done_Face): Ditto.
* src/pcf/pcf.h: Use FT_LOCAL for `PCF_Done_Face'.

2 files changed, 13 insertions, 12 deletions

diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index abca45a30..4d982888a 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -18,6 +18,7 @@
 
 #include <ft2build.h>
 #include FT_INTERNAL_POSTSCRIPT_AUX_H
+#include FT_INTERNAL_TYPE1_ERRORS_H
 #include FT_INTERNAL_DEBUG_H
 #include FT_ERRORS_H
 #include "psobjs.h"
@@ -120,7 +121,7 @@
 
     table->capacity = new_size;
 
-    return FT_Err_Ok;
+    return T1_Err_Ok;
   }
 
 
@@ -155,7 +156,7 @@
     if ( index < 0 || index > table->max_elems )
     {
       FT_ERROR(( "PS_Table_Add: invalid index\n" ));
-      return FT_Err_Invalid_Argument;
+      return T1_Err_Invalid_Argument;
     }
 
     /* grow the base block if needed */
@@ -179,7 +180,7 @@
     MEM_Copy( table->block + table->cursor, object, length );
 
     table->cursor += length;
-    return FT_Err_Ok;
+    return T1_Err_Ok;
   }
 
 
@@ -877,13 +878,13 @@
     FT_UNUSED( pflags );
 #endif
 
-    error = FT_Err_Ok;
+    error = T1_Err_Ok;
 
   Exit:
     return error;
 
   Fail:
-    error = FT_Err_Invalid_File_Format;
+    error = T1_Err_Invalid_File_Format;
     goto Exit;
   }
 
@@ -949,7 +950,7 @@
     return error;
 
   Fail:
-    error = FT_Err_Invalid_File_Format;
+    error = T1_Err_Invalid_File_Format;
     goto Exit;
   }
 
@@ -1190,7 +1191,7 @@
     if ( !builder->load_points )
     {
       outline->n_contours++;
-      return FT_Err_Ok;
+      return T1_Err_Ok;
     }
 
     error = FT_GlyphLoader_Check_Points( builder->loader, 0, 1 );
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index a19807e7a..a700e377c 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -344,7 +344,7 @@
     limit = zone->limit  = charstring_base + charstring_len;
     ip    = zone->cursor = zone->base;
 
-    error   = FT_Err_Ok;
+    error   = T1_Err_Ok;
     outline = builder->current;
 
     x = builder->pos_x;
@@ -713,7 +713,7 @@
 
           /* return now! */
           FT_TRACE4(( "\n\n" ));
-          return FT_Err_Ok;
+          return T1_Err_Ok;
 
         case op_hsbw:
           FT_TRACE4(( " hsbw" ));
@@ -729,7 +729,7 @@
           /* the glyph's metrics (lsb + advance width), not load the   */
           /* rest of it; so exit immediately                           */
           if ( builder->metrics_only )
-            return FT_Err_Ok;
+            return T1_Err_Ok;
 
           break;
 
@@ -753,7 +753,7 @@
           /* the glyph's metrics (lsb + advance width), not load the   */
           /* rest of it; so exit immediately                           */
           if ( builder->metrics_only )
-            return FT_Err_Ok;
+            return T1_Err_Ok;
 
           break;
 
@@ -1054,7 +1054,7 @@
       {
         FT_ERROR(( "T1_Decoder_Init: " ));
         FT_ERROR(( "the `psnames' module is not available\n" ));
-        return FT_Err_Unimplemented_Feature;
+        return T1_Err_Unimplemented_Feature;
       }
 
       decoder->psnames = psnames;