* src/cff/cffdrivr.c (cff_get_glyph_name): Fix debug message.
* src/cff/cffobjs.c (CFF_Driver_Init, CFF_Driver_Done)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Removed.
* src/cff/sfobjs.c (SFNT_Load_Face)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.
* src/truetype/ttobjs.c (TT_Init_Driver, TT_Done_Driver)
[TT_CONFIG_OPTION_EXTEND_ENGINE]: Ditto.
* src/truetype/ttdriver.c, src/truetype/ttobjs.c,
src/truetype/ttobjs.h: Renaming driver functions to the
FT_<Subject>_<Action> scheme:
TT_Init_Driver => TT_Driver_Init
TT_Done_Driver => TT_Driver_Done
TT_Init_Face => TT_Face_Init
TT_Done_Face => TT_Face_Done
TT_Init_Size => TT_Size_Init
TT_Done_Size => TT_Size_Done
TT_Reset_Size => TT_Size_Reset
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 4c18883..8f35020 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -4,7 +4,7 @@
/* */
/* CFF token stream parser (body) */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -48,7 +48,7 @@
/* now generate handlers for the most simple fields */
- typedef FT_Error (*CFF_Field_Reader)( CFF_Parser parser );
+ typedef FT_Error (*CFF_Field_Reader)( CFF_Parser parser );
typedef struct CFF_Field_Handler_
{
@@ -64,9 +64,9 @@
FT_LOCAL_DEF( void )
- CFF_Parser_Init( CFF_Parser parser,
- FT_UInt code,
- void* object )
+ CFF_Parser_Init( CFF_Parser parser,
+ FT_UInt code,
+ void* object )
{
FT_MEM_SET( parser, 0, sizeof ( *parser ) );
@@ -311,15 +311,15 @@
}
static FT_Error
- cff_parse_font_matrix( CFF_Parser parser )
+ cff_parse_font_matrix( CFF_Parser parser )
{
CFF_FontRecDict dict = (CFF_FontRecDict)parser->object;
- FT_Matrix* matrix = &dict->font_matrix;
- FT_Vector* offset = &dict->font_offset;
- FT_UShort* upm = &dict->units_per_em;
- FT_Byte** data = parser->stack;
- FT_Error error;
- FT_Fixed temp;
+ FT_Matrix* matrix = &dict->font_matrix;
+ FT_Vector* offset = &dict->font_offset;
+ FT_UShort* upm = &dict->units_per_em;
+ FT_Byte** data = parser->stack;
+ FT_Error error;
+ FT_Fixed temp;
error = CFF_Err_Stack_Underflow;
@@ -359,12 +359,12 @@
static FT_Error
- cff_parse_font_bbox( CFF_Parser parser )
+ cff_parse_font_bbox( CFF_Parser parser )
{
CFF_FontRecDict dict = (CFF_FontRecDict)parser->object;
- FT_BBox* bbox = &dict->font_bbox;
- FT_Byte** data = parser->stack;
- FT_Error error;
+ FT_BBox* bbox = &dict->font_bbox;
+ FT_Byte** data = parser->stack;
+ FT_Error error;
error = CFF_Err_Stack_Underflow;
@@ -383,11 +383,11 @@
static FT_Error
- cff_parse_private_dict( CFF_Parser parser )
+ cff_parse_private_dict( CFF_Parser parser )
{
CFF_FontRecDict dict = (CFF_FontRecDict)parser->object;
- FT_Byte** data = parser->stack;
- FT_Error error;
+ FT_Byte** data = parser->stack;
+ FT_Error error;
error = CFF_Err_Stack_Underflow;
@@ -404,11 +404,11 @@
static FT_Error
- cff_parse_cid_ros( CFF_Parser parser )
+ cff_parse_cid_ros( CFF_Parser parser )
{
CFF_FontRecDict dict = (CFF_FontRecDict)parser->object;
- FT_Byte** data = parser->stack;
- FT_Error error;
+ FT_Byte** data = parser->stack;
+ FT_Error error;
error = CFF_Err_Stack_Underflow;
@@ -480,9 +480,9 @@
FT_LOCAL_DEF( FT_Error )
- CFF_Parser_Run( CFF_Parser parser,
- FT_Byte* start,
- FT_Byte* limit )
+ CFF_Parser_Run( CFF_Parser parser,
+ FT_Byte* start,
+ FT_Byte* limit )
{
FT_Byte* p = start;
FT_Error error = CFF_Err_Ok;