diff options
Diffstat (limited to 'freetype/src/pfr')
-rw-r--r-- | freetype/src/pfr/pfrdrivr.c | 20 | ||||
-rw-r--r-- | freetype/src/pfr/pfrerror.h | 3 | ||||
-rw-r--r-- | freetype/src/pfr/pfrobjs.c | 8 |
3 files changed, 17 insertions, 14 deletions
diff --git a/freetype/src/pfr/pfrdrivr.c b/freetype/src/pfr/pfrdrivr.c index 24d89a328..783b82f7b 100644 --- a/freetype/src/pfr/pfrdrivr.c +++ b/freetype/src/pfr/pfrdrivr.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR driver interface (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2006, 2008, 2010 by */ +/* Copyright 2002-2004, 2006, 2008, 2010, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -173,7 +173,7 @@ FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE, - sizeof( FT_DriverRec ), + sizeof ( FT_DriverRec ), "pfr", 0x10000L, @@ -181,14 +181,14 @@ NULL, - 0, - 0, + 0, /* FT_Module_Constructor */ + 0, /* FT_Module_Destructor */ pfr_get_service }, - sizeof( PFR_FaceRec ), - sizeof( PFR_SizeRec ), - sizeof( PFR_SlotRec ), + sizeof ( PFR_FaceRec ), + sizeof ( PFR_SizeRec ), + sizeof ( PFR_SlotRec ), pfr_face_init, pfr_face_done, @@ -205,9 +205,9 @@ pfr_get_kerning, 0, /* FT_Face_AttachFunc */ - 0, /* FT_Face_GetAdvancesFunc */ - 0, /* FT_Size_RequestFunc */ - 0, /* FT_Size_SelectFunc */ + 0, /* FT_Face_GetAdvancesFunc */ + 0, /* FT_Size_RequestFunc */ + 0, /* FT_Size_SelectFunc */ }; diff --git a/freetype/src/pfr/pfrerror.h b/freetype/src/pfr/pfrerror.h index 2e1c401dd..94dc8c5e1 100644 --- a/freetype/src/pfr/pfrerror.h +++ b/freetype/src/pfr/pfrerror.h @@ -4,7 +4,7 @@ /* */ /* PFR error codes (specification only). */ /* */ -/* Copyright 2002 by */ +/* Copyright 2002, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,6 +29,7 @@ #undef __FTERRORS_H__ +#undef FT_ERR_PREFIX #define FT_ERR_PREFIX PFR_Err_ #define FT_ERR_BASE FT_Mod_Err_PFR diff --git a/freetype/src/pfr/pfrobjs.c b/freetype/src/pfr/pfrobjs.c index 036d26beb..57dc7ea19 100644 --- a/freetype/src/pfr/pfrobjs.c +++ b/freetype/src/pfr/pfrobjs.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR object methods (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */ +/* Copyright 2002-2008, 2010-2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -23,7 +23,7 @@ #include "pfrsbit.h" #include FT_OUTLINE_H #include <freetype/internal/ftdebug.h> -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include "pfrerror.h" @@ -77,6 +77,8 @@ FT_UNUSED( params ); + FT_TRACE2(( "PFR driver\n" )); + /* load the header and check it */ error = pfr_header_load( &face->header, stream ); if ( error ) @@ -84,7 +86,7 @@ if ( !pfr_header_check( &face->header ) ) { - FT_TRACE4(( "pfr_face_init: not a valid PFR font\n" )); + FT_TRACE2(( " not a PFR font\n" )); error = PFR_Err_Unknown_File_Format; goto Exit; } |