commit 429978bdcad40ed6fdbad6f774a1b6057644b6ad
author David Turner <david@freetype.org> Thu Mar 14 10:09:35 2002 +0000
committer David Turner <david@freetype.org> Thu Mar 14 10:09:35 2002 +0000
tree a5b7061a9665e3a59e8d6656952bbac78c3736e2
parent f39b7a0c3c5c73ddbf8384585227554c27f5f1c1

        * include/freetype/internal/psaux.h,
          src/cid/cidload.c, src/cidtoken.h,
          src/psaux/psobjs.c, src/psaux/psobjs.h, src/psaux/t1decode.c,
          stc/type1/t1load.c, src/type1/t1tokens.h: updated common Postscript
          type definitions

src/cid/cidload.c

diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 3df25b6..fdb5230 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -110,11 +110,11 @@
     /* we must now compute the address of our target object */
     switch ( keyword->location )
     {
-    case t1_field_cid_info:
+    case T1_FIELD_LOCATION_CID_INFO:
       object = (FT_Byte*)cid;
       break;
 
-    case t1_field_font_info:
+    case T1_FIELD_LOCATION_FONT_INFO:
       object = (FT_Byte*)&cid->font_info;
       break;
 
@@ -134,7 +134,7 @@
         dict = cid->font_dicts + parser->num_dict;
         switch ( keyword->location )
         {
-        case t1_field_private:
+        case T1_FIELD_LOCATION_PRIVATE:
           object = (FT_Byte*)&dict->private_dict;
           break;
 
@@ -278,7 +278,7 @@
     T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox )
     T1_FIELD_CALLBACK( "FDArray", parse_fd_array )
     T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix )
-    { 0, t1_field_cid_info, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0 }
+    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0 }
   };