Commit 429978bdcad40ed6fdbad6f774a1b6057644b6ad
2002-03-14T10:09:35
* 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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570
diff --git a/ChangeLog b/ChangeLog
index 10290b7..d6ed1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,13 @@
FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
+ * 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
+
+
2002-03-13 Antoine Leca <antoine@oriolnet.com>
* include/freetype/config/ftoption.h: changed the automatic detection
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index a104fd5..d5e9bc5 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -114,15 +114,15 @@ FT_BEGIN_HEADER
/* */
typedef struct PS_TableRec_
{
- FT_Byte* block; /* current memory block */
- FT_Offset cursor; /* current cursor in memory block */
- FT_Offset capacity; /* current size of memory block */
- FT_Long init;
+ FT_Byte* block; /* current memory block */
+ FT_Offset cursor; /* current cursor in memory block */
+ FT_Offset capacity; /* current size of memory block */
+ FT_Long init;
- FT_Int max_elems;
- FT_Int num_elems;
- FT_Byte** elements; /* addresses of table elements */
- FT_Int* lengths; /* lengths of table elements */
+ FT_Int max_elems;
+ FT_Int num_elems;
+ FT_Byte** elements; /* addresses of table elements */
+ FT_Int* lengths; /* lengths of table elements */
FT_Memory memory;
PS_Table_FuncsRec funcs;
@@ -146,7 +146,7 @@ FT_BEGIN_HEADER
/* simple enumeration type used to identify token types */
- typedef enum T1_Token_Type_
+ typedef enum T1_TokenType_
{
T1_TOKEN_TYPE_NONE = 0,
T1_TOKEN_TYPE_ANY,
@@ -156,7 +156,7 @@ FT_BEGIN_HEADER
/* do not remove */
T1_TOKEN_TYPE_MAX
- } T1_Token_Type;
+ } T1_TokenType;
/* a simple structure used to identify tokens */
@@ -164,13 +164,13 @@ FT_BEGIN_HEADER
{
FT_Byte* start; /* first character of token in input stream */
FT_Byte* limit; /* first character after the token */
- T1_Token_Type type; /* type of token */
+ T1_TokenType type; /* type of token */
} T1_TokenRec;
/* enumeration type used to identify object fields */
- typedef enum T1_Field_Type_
+ typedef enum T1_FieldType_
{
T1_FIELD_TYPE_NONE = 0,
T1_FIELD_TYPE_BOOL,
@@ -184,39 +184,39 @@ FT_BEGIN_HEADER
/* do not remove */
T1_FIELD_TYPE_MAX
- } T1_Field_Type;
+ } T1_FieldType;
- typedef enum T1_Field_Location_
+ typedef enum T1_FieldLocation_
{
- t1_field_cid_info,
- t1_field_font_dict,
- t1_field_font_info,
- t1_field_private,
+ T1_FIELD_LOCATION_CID_INFO,
+ T1_FIELD_LOCATION_FONT_DICT,
+ T1_FIELD_LOCATION_FONT_INFO,
+ T1_FIELD_LOCATION_PRIVATE,
/* do not remove */
- t1_field_location_max
+ T1_FIELD_LOCATION_MAX
- } T1_Field_Location;
+ } T1_FieldLocation;
typedef void
- (*T1_Field_Parser)( FT_Face face,
- FT_Pointer parser );
+ (*T1_Field_ParseFunc)( FT_Face face,
+ FT_Pointer parser );
/* structure type used to model object fields */
typedef struct T1_FieldRec_
{
- const char* ident; /* field identifier */
- T1_Field_Location location;
- T1_Field_Type type; /* type of field */
- T1_Field_Parser reader;
- FT_UInt offset; /* offset of field in object */
- FT_Byte size; /* size of field in bytes */
- FT_UInt array_max; /* maximal number of elements for */
- /* array */
- FT_UInt count_offset; /* offset of element count for */
- /* arrays */
+ const char* ident; /* field identifier */
+ T1_FieldLocation location;
+ T1_FieldType type; /* type of field */
+ T1_Field_ParseFunc reader;
+ FT_UInt offset; /* offset of field in object */
+ FT_Byte size; /* size of field in bytes */
+ FT_UInt array_max; /* maximal number of elements for */
+ /* array */
+ FT_UInt count_offset; /* offset of element count for */
+ /* arrays */
} T1_FieldRec;
@@ -232,7 +232,7 @@ FT_BEGIN_HEADER
#define T1_NEW_CALLBACK_FIELD( _ident, _reader ) \
{ \
_ident, T1CODE, T1_FIELD_TYPE_CALLBACK, \
- (T1_Field_Parser)_reader, \
+ (T1_Field_ParseFunc)_reader, \
0, 0, \
0, 0 \
},
@@ -402,34 +402,34 @@ FT_BEGIN_HEADER
/*************************************************************************/
- typedef struct T1_Builder_ T1_Builder;
+ typedef struct T1_BuilderRec_* T1_Builder;
typedef FT_Error
- (*T1_Builder_Check_Points_Func)( T1_Builder* builder,
- FT_Int count );
+ (*T1_Builder_Check_Points_Func)( T1_Builder builder,
+ FT_Int count );
typedef void
- (*T1_Builder_Add_Point_Func)( T1_Builder* builder,
+ (*T1_Builder_Add_Point_Func)( T1_Builder builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag );
typedef FT_Error
- (*T1_Builder_Add_Point1_Func)( T1_Builder* builder,
+ (*T1_Builder_Add_Point1_Func)( T1_Builder builder,
FT_Pos x,
FT_Pos y );
typedef FT_Error
- (*T1_Builder_Add_Contour_Func)( T1_Builder* builder );
+ (*T1_Builder_Add_Contour_Func)( T1_Builder builder );
typedef FT_Error
- (*T1_Builder_Start_Point_Func)( T1_Builder* builder,
+ (*T1_Builder_Start_Point_Func)( T1_Builder builder,
FT_Pos x,
FT_Pos y );
typedef void
- (*T1_Builder_Close_Contour_Func)( T1_Builder* builder );
+ (*T1_Builder_Close_Contour_Func)( T1_Builder builder );
typedef const struct T1_Builder_FuncsRec_* T1_Builder_Funcs;
@@ -437,14 +437,14 @@ FT_BEGIN_HEADER
typedef struct T1_Builder_FuncsRec_
{
void
- (*init)( T1_Builder* builder,
+ (*init)( T1_Builder builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot,
FT_Bool hinting );
void
- (*done)( T1_Builder* builder );
+ (*done)( T1_Builder builder );
T1_Builder_Check_Points_Func check_points;
T1_Builder_Add_Point_Func add_point;
@@ -459,7 +459,7 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Structure> */
- /* T1_Builder */
+ /* T1_BuilderRec */
/* */
/* <Description> */
/* A structure used during glyph loading to store its outline. */
@@ -512,7 +512,7 @@ FT_BEGIN_HEADER
/* */
/* funcs :: An array of function pointers for the builder. */
/* */
- struct T1_Builder_
+ typedef struct T1_BuilderRec_
{
FT_Memory memory;
FT_Face face;
@@ -545,7 +545,8 @@ FT_BEGIN_HEADER
void* hints_globals; /* hinter-specific */
T1_Builder_FuncsRec funcs;
- };
+
+ } T1_BuilderRec;
/*************************************************************************/
@@ -602,7 +603,7 @@ FT_BEGIN_HEADER
FT_Size size,
FT_GlyphSlot slot,
FT_Byte** glyph_names,
- PS_Blend blend,
+ PS_Blend blend,
FT_Bool hinting,
T1_Decoder_Callback callback );
@@ -619,7 +620,7 @@ FT_BEGIN_HEADER
typedef struct T1_DecoderRec_
{
- T1_Builder builder;
+ T1_BuilderRec builder;
FT_Long stack[T1_MAX_CHARSTRINGS_OPERANDS];
FT_Long* top;
@@ -643,7 +644,7 @@ FT_BEGIN_HEADER
FT_Int num_flex_vectors;
FT_Vector flex_vectors[7];
- PS_Blend blend; /* for multiple master support */
+ PS_Blend blend; /* for multiple master support */
T1_Decoder_Callback parse_callback;
T1_Decoder_FuncsRec funcs;
@@ -661,10 +662,10 @@ FT_BEGIN_HEADER
typedef struct PSAux_Interface_
{
- const PS_Table_FuncsRec* ps_table_funcs;
- const PS_Parser_FuncsRec* ps_parser_funcs;
- const T1_Builder_FuncsRec* t1_builder_funcs;
- const T1_Decoder_FuncsRec* t1_decoder_funcs;
+ const PS_Table_Funcs ps_table_funcs;
+ const PS_Parser_Funcs ps_parser_funcs;
+ const T1_Builder_Funcs t1_builder_funcs;
+ const T1_Decoder_Funcs t1_decoder_funcs;
void
(*t1_decrypt)( FT_Byte* buffer,
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 }
};
diff --git a/src/cid/cidtoken.h b/src/cid/cidtoken.h
index 2d386ee..8b67bde 100644
--- a/src/cid/cidtoken.h
+++ b/src/cid/cidtoken.h
@@ -19,7 +19,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE CID_FaceInfoRec
#undef T1CODE
-#define T1CODE t1_field_cid_info
+#define T1CODE T1_FIELD_LOCATION_CID_INFO
T1_FIELD_STRING( "CIDFontName", cid_font_name )
T1_FIELD_NUM ( "CIDFontVersion", cid_version )
@@ -37,7 +37,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE PS_FontInfoRec
#undef T1CODE
-#define T1CODE t1_field_font_info
+#define T1CODE T1_FIELD_LOCATION_FONT_INFO
T1_FIELD_STRING( "version", version )
T1_FIELD_STRING( "Notice", notice )
@@ -53,7 +53,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE CID_FaceDictRec
#undef T1CODE
-#define T1CODE t1_field_font_dict
+#define T1CODE T1_FIELD_LOCATION_FONT_DICT
T1_FIELD_NUM ( "PaintType", paint_type )
T1_FIELD_NUM ( "FontType", font_type )
@@ -69,7 +69,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE PS_PrivateRec
#undef T1CODE
-#define T1CODE t1_field_private
+#define T1CODE T1_FIELD_LOCATION_PRIVATE
T1_FIELD_NUM ( "UniqueID", unique_id )
T1_FIELD_NUM ( "lenIV", lenIV )
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 8514132..9d9e982 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -133,7 +133,7 @@
/* PS_Table_Add */
/* */
/* <Description> */
- /* Adds an object to a PS_TableRec, possibly growing its memory block. */
+ /* Adds an object to a PS_Table, possibly growing its memory block. */
/* */
/* <InOut> */
/* table :: The target table. */
@@ -1071,7 +1071,7 @@
/* glyph :: The current glyph object. */
/* */
FT_LOCAL_DEF( void )
- T1_Builder_Init( T1_Builder* builder,
+ T1_Builder_Init( T1_Builder builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph,
@@ -1133,7 +1133,7 @@
/* builder :: A pointer to the glyph builder to finalize. */
/* */
FT_LOCAL_DEF( void )
- T1_Builder_Done( T1_Builder* builder )
+ T1_Builder_Done( T1_Builder builder )
{
FT_GlyphSlot glyph = builder->glyph;
@@ -1145,7 +1145,7 @@
/* check that there is enough room for `count' more points */
FT_LOCAL_DEF( FT_Error )
- T1_Builder_Check_Points( T1_Builder* builder,
+ T1_Builder_Check_Points( T1_Builder builder,
FT_Int count )
{
return FT_GlyphLoader_Check_Points( builder->loader, count, 0 );
@@ -1154,7 +1154,7 @@
/* add a new point, do not check space */
FT_LOCAL_DEF( void )
- T1_Builder_Add_Point( T1_Builder* builder,
+ T1_Builder_Add_Point( T1_Builder builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag )
@@ -1185,7 +1185,7 @@
/* check space for a new on-curve point, then add it */
FT_LOCAL_DEF( FT_Error )
- T1_Builder_Add_Point1( T1_Builder* builder,
+ T1_Builder_Add_Point1( T1_Builder builder,
FT_Pos x,
FT_Pos y )
{
@@ -1202,7 +1202,7 @@
/* check room for a new contour, then add it */
FT_LOCAL_DEF( FT_Error )
- T1_Builder_Add_Contour( T1_Builder* builder )
+ T1_Builder_Add_Contour( T1_Builder builder )
{
FT_Outline* outline = builder->current;
FT_Error error;
@@ -1230,7 +1230,7 @@
/* if a path was begun, add its first on-curve point */
FT_LOCAL_DEF( FT_Error )
- T1_Builder_Start_Point( T1_Builder* builder,
+ T1_Builder_Start_Point( T1_Builder builder,
FT_Pos x,
FT_Pos y )
{
@@ -1251,7 +1251,7 @@
/* close the current contour */
FT_LOCAL_DEF( void )
- T1_Builder_Close_Contour( T1_Builder* builder )
+ T1_Builder_Close_Contour( T1_Builder builder )
{
FT_Outline* outline = builder->current;
diff --git a/src/psaux/psobjs.h b/src/psaux/psobjs.h
index 23fd0cc..38e25d5 100644
--- a/src/psaux/psobjs.h
+++ b/src/psaux/psobjs.h
@@ -144,42 +144,42 @@ FT_BEGIN_HEADER
/*************************************************************************/
FT_LOCAL( void )
- T1_Builder_Init( T1_Builder* builder,
+ T1_Builder_Init( T1_Builder builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph,
FT_Bool hinting );
FT_LOCAL( void )
- T1_Builder_Done( T1_Builder* builder );
+ T1_Builder_Done( T1_Builder builder );
FT_LOCAL( FT_Error )
- T1_Builder_Check_Points( T1_Builder* builder,
+ T1_Builder_Check_Points( T1_Builder builder,
FT_Int count );
FT_LOCAL( void )
- T1_Builder_Add_Point( T1_Builder* builder,
+ T1_Builder_Add_Point( T1_Builder builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag );
FT_LOCAL( FT_Error )
- T1_Builder_Add_Point1( T1_Builder* builder,
+ T1_Builder_Add_Point1( T1_Builder builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL( FT_Error )
- T1_Builder_Add_Contour( T1_Builder* builder );
+ T1_Builder_Add_Contour( T1_Builder builder );
FT_LOCAL( FT_Error )
- T1_Builder_Start_Point( T1_Builder* builder,
+ T1_Builder_Start_Point( T1_Builder builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL( void )
- T1_Builder_Close_Contour( T1_Builder* builder );
+ T1_Builder_Close_Contour( T1_Builder builder );
/*************************************************************************/
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 9c67360..c556a51 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -339,7 +339,7 @@
T1_Decoder_Zone zone;
FT_Byte* ip;
FT_Byte* limit;
- T1_Builder* builder = &decoder->builder;
+ T1_Builder builder = &decoder->builder;
FT_Pos x, y, orig_x, orig_y;
T1_Hints_Funcs hinter;
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 9228b0d..299d90d 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -713,7 +713,7 @@
/* we are now going to take care of it */
switch ( field->location )
{
- case t1_field_font_info:
+ case T1_FIELD_LOCATION_FONT_INFO:
dummy_object = &face->type1.font_info;
objects = &dummy_object;
max_objects = 0;
@@ -725,7 +725,7 @@
}
break;
- case t1_field_private:
+ case T1_FIELD_LOCATION_PRIVATE:
dummy_object = &face->type1.private_dict;
objects = &dummy_object;
max_objects = 0;
@@ -1478,7 +1478,7 @@
T1_FIELD_CALLBACK( "shareddict", parse_shared_dict )
#endif
- { 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 }
};
diff --git a/src/type1/t1tokens.h b/src/type1/t1tokens.h
index 1a244d8..3888534 100644
--- a/src/type1/t1tokens.h
+++ b/src/type1/t1tokens.h
@@ -19,7 +19,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE PS_FontInfoRec
#undef T1CODE
-#define T1CODE t1_field_font_info
+#define T1CODE T1_FIELD_LOCATION_FONT_INFO
T1_FIELD_STRING( "version", version )
T1_FIELD_STRING( "Notice", notice )
@@ -36,7 +36,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE PS_PrivateRec
#undef T1CODE
-#define T1CODE t1_field_private
+#define T1CODE T1_FIELD_LOCATION_PRIVATE
T1_FIELD_NUM ( "UniqueID", unique_id )
T1_FIELD_NUM ( "lenIV", lenIV )
@@ -63,7 +63,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontRec
#undef T1CODE
-#define T1CODE t1_field_font_dict
+#define T1CODE T1_FIELD_LOCATION_FONT_DICT
T1_FIELD_NUM( "PaintType", paint_type )
T1_FIELD_NUM( "FontType", font_type )