diff options
115 files changed, 142 insertions, 128 deletions
@@ -1,3 +1,13 @@ +2018-08-15 Werner Lemberg <wl@gnu.org> + + Don't use `trace_' prefix for FT_COMPONENT arguments. + + * include/freetype/internal/ftdebug.h (FT_TRACE_COMP, + FT_TRACE_COMP_): New auxiliary macros to add `trace_' prefix. + (FT_TRACE): Use `FT_TRACE_COMP'. + + */* (FT_COMPONENT): Updated. + 2018-08-14 Werner Lemberg <wl@gnu.org> Use formatting string in FT_TRACEX calls for non-simple arguments. diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index d6e8a3a50..34f8a00ab 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h @@ -84,11 +84,15 @@ FT_BEGIN_HEADER #ifdef FT_DEBUG_LEVEL_TRACE -#define FT_TRACE( level, varformat ) \ - do \ - { \ - if ( ft_trace_levels[FT_COMPONENT] >= level ) \ - FT_Message varformat; \ + /* we need two macros here to make cpp expand `FT_COMPONENT' */ +#define FT_TRACE_COMP( x ) FT_TRACE_COMP_( x ) +#define FT_TRACE_COMP_( x ) trace_ ## x + +#define FT_TRACE( level, varformat ) \ + do \ + { \ + if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] >= level ) \ + FT_Message varformat; \ } while ( 0 ) #else /* !FT_DEBUG_LEVEL_TRACE */ diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index dc3815339..ef02ed02f 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -50,7 +50,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afcjk +#define FT_COMPONENT afcjk /*************************************************************************/ diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index 9e7764b43..f40b5af51 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -29,7 +29,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afglobal +#define FT_COMPONENT afglobal /* get writing system specific header files */ diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index 65f0e85f8..171ceb818 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -29,7 +29,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afhints +#define FT_COMPONENT afhints /* Get new segment for given axis. */ diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index a90fc1ca7..21f666953 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -37,7 +37,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_aflatin +#define FT_COMPONENT aflatin /* needed for computation of round vs. flat segments */ diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c index c5ce0439e..25767084a 100644 --- a/src/autofit/aflatin2.c +++ b/src/autofit/aflatin2.c @@ -44,7 +44,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_aflatin2 +#define FT_COMPONENT aflatin2 FT_LOCAL_DEF( FT_Error ) diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index 7f9f043c5..79bc84d4d 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -66,7 +66,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afmodule +#define FT_COMPONENT afmodule static FT_Error @@ -507,7 +507,7 @@ glyph_index, load_flags ); #ifdef FT_DEBUG_LEVEL_TRACE - if ( ft_trace_levels[FT_COMPONENT] ) + if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] ) { #endif af_glyph_hints_dump_points( hints, 0 ); diff --git a/src/autofit/afshaper.c b/src/autofit/afshaper.c index b2f5d18bf..486d7133c 100644 --- a/src/autofit/afshaper.c +++ b/src/autofit/afshaper.c @@ -33,7 +33,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afshaper +#define FT_COMPONENT afshaper /* diff --git a/src/autofit/afwarp.c b/src/autofit/afwarp.c index 636f01f6a..2e9d14624 100644 --- a/src/autofit/afwarp.c +++ b/src/autofit/afwarp.c @@ -34,7 +34,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_afwarp +#define FT_COMPONENT afwarp /* The weights cover the range 0/64 - 63/64 of a pixel. Obviously, */ diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index dc28c406d..c04eec430 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -31,7 +31,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_bitmap +#define FT_COMPONENT bitmap static diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 2cea03c20..f110c9ee2 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -65,7 +65,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_calc +#define FT_COMPONENT calc /* transfer sign, leaving a positive number; */ diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 475d5ccba..3efa461c4 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -23,7 +23,7 @@ #include FT_INTERNAL_OBJECTS_H #undef FT_COMPONENT -#define FT_COMPONENT trace_gloader +#define FT_COMPONENT gloader /*************************************************************************/ diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 8bc86a542..a752dbda3 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -44,7 +44,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_glyph +#define FT_COMPONENT glyph /*************************************************************************/ diff --git a/src/base/ftinit.c b/src/base/ftinit.c index e0f2ccd2b..f25d80a5b 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -51,7 +51,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_init +#define FT_COMPONENT init #undef FT_USE_MODULE diff --git a/src/base/ftmm.c b/src/base/ftmm.c index b0d9d4b74..54ab9e785 100644 --- a/src/base/ftmm.c +++ b/src/base/ftmm.c @@ -32,7 +32,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_mm +#define FT_COMPONENT mm static FT_Error diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 2b444056c..e5389efc8 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -278,7 +278,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_objs +#define FT_COMPONENT objs /*************************************************************************/ @@ -2189,7 +2189,7 @@ { #undef FT_COMPONENT -#define FT_COMPONENT trace_raccess +#define FT_COMPONENT raccess FT_Memory memory = library->memory; FT_Error error = FT_ERR( Unknown_File_Format ); @@ -2267,7 +2267,7 @@ return error; #undef FT_COMPONENT -#define FT_COMPONENT trace_objs +#define FT_COMPONENT objs } @@ -2295,7 +2295,7 @@ { #undef FT_COMPONENT -#define FT_COMPONENT trace_raccess +#define FT_COMPONENT raccess #ifdef FT_DEBUG_LEVEL_TRACE FT_TRACE3(( "Try as dfont: " )); @@ -2308,7 +2308,7 @@ FT_TRACE3(( "%s\n", error ? "failed" : "successful" )); #undef FT_COMPONENT -#define FT_COMPONENT trace_objs +#define FT_COMPONENT objs } @@ -4617,7 +4617,7 @@ #ifdef FT_DEBUG_LEVEL_TRACE #undef FT_COMPONENT -#define FT_COMPONENT trace_checksum +#define FT_COMPONENT checksum /* * Computing the MD5 checksum is expensive, unnecessarily distorting a @@ -4731,7 +4731,7 @@ } #undef FT_COMPONENT -#define FT_COMPONENT trace_objs +#define FT_COMPONENT objs #endif /* FT_DEBUG_LEVEL_TRACE */ diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 611b4f60f..2266ce19c 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_outline +#define FT_COMPONENT outline static diff --git a/src/base/ftpsprop.c b/src/base/ftpsprop.c index 9c5344a5b..e2c3437f1 100644 --- a/src/base/ftpsprop.c +++ b/src/base/ftpsprop.c @@ -32,7 +32,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_psprops +#define FT_COMPONENT psprops FT_BASE_CALLBACK_DEF( FT_Error ) diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c index c61765be1..2740cf404 100644 --- a/src/base/ftrfork.c +++ b/src/base/ftrfork.c @@ -32,7 +32,7 @@ #include "ftbase.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_raccess +#define FT_COMPONENT raccess /*************************************************************************/ diff --git a/src/base/ftstream.c b/src/base/ftstream.c index 9c8cab361..8a7affa5c 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -28,7 +28,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_stream +#define FT_COMPONENT stream FT_BASE_DEF( void ) diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c index 553910511..ec7b93510 100644 --- a/src/base/ftsynth.c +++ b/src/base/ftsynth.c @@ -31,7 +31,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_synth +#define FT_COMPONENT synth /*************************************************************************/ diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index d761ad929..8fffe4833 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -154,7 +154,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_io +#define FT_COMPONENT io /* We use the macro STREAM_FILE for convenience to extract the */ /* system-specific stream handle from a given FreeType stream object */ diff --git a/src/base/ftutil.c b/src/base/ftutil.c index eced7bba9..403f96991 100644 --- a/src/base/ftutil.c +++ b/src/base/ftutil.c @@ -30,7 +30,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_memory +#define FT_COMPONENT memory /*************************************************************************/ @@ -236,7 +236,7 @@ /*************************************************************************/ #undef FT_COMPONENT -#define FT_COMPONENT trace_list +#define FT_COMPONENT list /* documentation is in ftlist.h */ diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 8e17bf580..fee6110a5 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -48,7 +48,7 @@ THE SOFTWARE. * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_bdfdriver +#define FT_COMPONENT bdfdriver typedef struct BDF_CMapRec_ diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c index 8133bc62c..e6a468211 100644 --- a/src/bdf/bdflib.c +++ b/src/bdf/bdflib.c @@ -49,7 +49,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_bdflib +#define FT_COMPONENT bdflib /************************************************************************** diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index f2b75eecb..7589ec3fe 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -27,7 +27,7 @@ #include "ftccback.h" #include "ftcerror.h" -#define FT_COMPONENT trace_cache +#define FT_COMPONENT cache /* diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index a9aa5d4e2..89014721f 100644 --- a/src/cache/ftccache.c +++ b/src/cache/ftccache.c @@ -25,7 +25,7 @@ #include "ftcerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_cache +#define FT_COMPONENT cache #define FTC_HASH_MAX_LOAD 2 diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index 47b8b7651..1e2269ba2 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -28,7 +28,7 @@ #include "ftcerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_cache +#define FT_COMPONENT cache /************************************************************************** diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 9be177321..adb0791ac 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -28,7 +28,7 @@ #undef FT_COMPONENT -#define FT_COMPONENT trace_cache +#define FT_COMPONENT cache static FT_Error diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index c802bf075..43bb25afd 100644 --- a/src/cache/ftcsbits.c +++ b/src/cache/ftcsbits.c @@ -27,7 +27,7 @@ #include "ftcerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_cache +#define FT_COMPONENT cache /*************************************************************************/ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 997a734fb..2789d20bf 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -56,7 +56,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffdriver +#define FT_COMPONENT cffdriver /*************************************************************************/ diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 88f56890c..c4d7ddbed 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffgload +#define FT_COMPONENT cffgload FT_LOCAL_DEF( FT_Error ) diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 015b2c80f..1454ec457 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -203,7 +203,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffload +#define FT_COMPONENT cffload /* read an offset from the index's stream current position */ diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index b3f0f99e3..391d18869 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -51,7 +51,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffobjs +#define FT_COMPONENT cffobjs /************************************************************************** diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 4b2ecc5f6..e152c9381 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -34,7 +34,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffparse +#define FT_COMPONENT cffparse FT_LOCAL_DEF( FT_Error ) @@ -808,7 +808,7 @@ #ifdef FT_DEBUG_LEVEL_TRACE /* beautify tracing message */ - if ( ft_trace_levels[FT_COMPONENT] < 4 ) + if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] < 4 ) FT_TRACE1(( "Multiple Master CFFs not supported yet," " handling first master design only\n" )); else diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index e47cd991b..36ccee544 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cidgload +#define FT_COMPONENT cidgload FT_CALLBACK_DEF( FT_Error ) diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 1546926dd..31e6f7eb3 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -35,7 +35,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cidload +#define FT_COMPONENT cidload /* read a single offset */ diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 91c4ed94a..72be8e5d4 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cidobjs +#define FT_COMPONENT cidobjs /************************************************************************** diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index 861c15768..9c9f1ca76 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -33,7 +33,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cidparse +#define FT_COMPONENT cidparse /*************************************************************************/ diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 935c11256..6d0594e17 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -41,7 +41,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ciddriver +#define FT_COMPONENT ciddriver /* diff --git a/src/gxvalid/gxvbsln.c b/src/gxvalid/gxvbsln.c index 8b554fde9..278093e79 100644 --- a/src/gxvalid/gxvbsln.c +++ b/src/gxvalid/gxvbsln.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvbsln +#define FT_COMPONENT gxvbsln /*************************************************************************/ diff --git a/src/gxvalid/gxvcommn.c b/src/gxvalid/gxvcommn.c index 4d8a4a2d7..fba2a97c0 100644 --- a/src/gxvalid/gxvcommn.c +++ b/src/gxvalid/gxvcommn.c @@ -35,7 +35,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvcommon +#define FT_COMPONENT gxvcommon /*************************************************************************/ diff --git a/src/gxvalid/gxvfeat.c b/src/gxvalid/gxvfeat.c index 91500bd66..7a9c9b0a6 100644 --- a/src/gxvalid/gxvfeat.c +++ b/src/gxvalid/gxvfeat.c @@ -37,7 +37,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvfeat +#define FT_COMPONENT gxvfeat /*************************************************************************/ diff --git a/src/gxvalid/gxvjust.c b/src/gxvalid/gxvjust.c index c8a9ab6ba..02d36e720 100644 --- a/src/gxvalid/gxvjust.c +++ b/src/gxvalid/gxvjust.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvjust +#define FT_COMPONENT gxvjust /* * referred `just' table format specification: diff --git a/src/gxvalid/gxvkern.c b/src/gxvalid/gxvkern.c index df9f10ea9..84eb36694 100644 --- a/src/gxvalid/gxvkern.c +++ b/src/gxvalid/gxvkern.c @@ -39,7 +39,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvkern +#define FT_COMPONENT gxvkern /*************************************************************************/ diff --git a/src/gxvalid/gxvlcar.c b/src/gxvalid/gxvlcar.c index fd167f6a0..d426a3a44 100644 --- a/src/gxvalid/gxvlcar.c +++ b/src/gxvalid/gxvlcar.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvlcar +#define FT_COMPONENT gxvlcar /*************************************************************************/ diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c index 847e0f1e1..24c1bc185 100644 --- a/src/gxvalid/gxvmod.c +++ b/src/gxvalid/gxvmod.c @@ -44,7 +44,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmodule +#define FT_COMPONENT gxvmodule static FT_Error diff --git a/src/gxvalid/gxvmort.c b/src/gxvalid/gxvmort.c index 1dfa5a3cd..2e94894f0 100644 --- a/src/gxvalid/gxvmort.c +++ b/src/gxvalid/gxvmort.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort static void diff --git a/src/gxvalid/gxvmort0.c b/src/gxvalid/gxvmort0.c index c7901cbde..6e905e7a4 100644 --- a/src/gxvalid/gxvmort0.c +++ b/src/gxvalid/gxvmort0.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort static const char* GXV_Mort_IndicScript_Msg[] = diff --git a/src/gxvalid/gxvmort1.c b/src/gxvalid/gxvmort1.c index f2f4f5764..1fade005b 100644 --- a/src/gxvalid/gxvmort1.c +++ b/src/gxvalid/gxvmort1.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort typedef struct GXV_mort_subtable_type1_StateOptRec_ diff --git a/src/gxvalid/gxvmort2.c b/src/gxvalid/gxvmort2.c index 33fea0f6e..28dd264db 100644 --- a/src/gxvalid/gxvmort2.c +++ b/src/gxvalid/gxvmort2.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort typedef struct GXV_mort_subtable_type2_StateOptRec_ diff --git a/src/gxvalid/gxvmort4.c b/src/gxvalid/gxvmort4.c index 6cf1e8089..66737e6c7 100644 --- a/src/gxvalid/gxvmort4.c +++ b/src/gxvalid/gxvmort4.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort static void diff --git a/src/gxvalid/gxvmort5.c b/src/gxvalid/gxvmort5.c index ae94e229e..d169fa681 100644 --- a/src/gxvalid/gxvmort5.c +++ b/src/gxvalid/gxvmort5.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmort +#define FT_COMPONENT gxvmort /* diff --git a/src/gxvalid/gxvmorx.c b/src/gxvalid/gxvmorx.c index f02ff5476..be15f808c 100644 --- a/src/gxvalid/gxvmorx.c +++ b/src/gxvalid/gxvmorx.c @@ -35,7 +35,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx static void diff --git a/src/gxvalid/gxvmorx0.c b/src/gxvalid/gxvmorx0.c index d65ced508..f3da0551d 100644 --- a/src/gxvalid/gxvmorx0.c +++ b/src/gxvalid/gxvmorx0.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx static void diff --git a/src/gxvalid/gxvmorx1.c b/src/gxvalid/gxvmorx1.c index 1c8da1be9..8fc797774 100644 --- a/src/gxvalid/gxvmorx1.c +++ b/src/gxvalid/gxvmorx1.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx typedef struct GXV_morx_subtable_type1_StateOptRec_ diff --git a/src/gxvalid/gxvmorx2.c b/src/gxvalid/gxvmorx2.c index d20fc57b3..1b7fb1631 100644 --- a/src/gxvalid/gxvmorx2.c +++ b/src/gxvalid/gxvmorx2.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx typedef struct GXV_morx_subtable_type2_StateOptRec_ diff --git a/src/gxvalid/gxvmorx4.c b/src/gxvalid/gxvmorx4.c index fce219c22..28ce5fc08 100644 --- a/src/gxvalid/gxvmorx4.c +++ b/src/gxvalid/gxvmorx4.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx FT_LOCAL_DEF( void ) diff --git a/src/gxvalid/gxvmorx5.c b/src/gxvalid/gxvmorx5.c index 882695419..123da0627 100644 --- a/src/gxvalid/gxvmorx5.c +++ b/src/gxvalid/gxvmorx5.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvmorx +#define FT_COMPONENT gxvmorx /* diff --git a/src/gxvalid/gxvopbd.c b/src/gxvalid/gxvopbd.c index 76b6961d3..4e284fbfb 100644 --- a/src/gxvalid/gxvopbd.c +++ b/src/gxvalid/gxvopbd.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvopbd +#define FT_COMPONENT gxvopbd /*************************************************************************/ diff --git a/src/gxvalid/gxvprop.c b/src/gxvalid/gxvprop.c index 856dd102c..6f8fb20a9 100644 --- a/src/gxvalid/gxvprop.c +++ b/src/gxvalid/gxvprop.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvprop +#define FT_COMPONENT gxvprop /*************************************************************************/ diff --git a/src/gxvalid/gxvtrak.c b/src/gxvalid/gxvtrak.c index d2ceb66cc..d0012dbe3 100644 --- a/src/gxvalid/gxvtrak.c +++ b/src/gxvalid/gxvtrak.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_gxvtrak +#define FT_COMPONENT gxvtrak /*************************************************************************/ diff --git a/src/otvalid/otvbase.c b/src/otvalid/otvbase.c index 918e3839d..a212b95c8 100644 --- a/src/otvalid/otvbase.c +++ b/src/otvalid/otvbase.c @@ -27,7 +27,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvbase +#define FT_COMPONENT otvbase static void diff --git a/src/otvalid/otvcommn.c b/src/otvalid/otvcommn.c index 4a2c95e2b..ddfdb8a78 100644 --- a/src/otvalid/otvcommn.c +++ b/src/otvalid/otvcommn.c @@ -26,7 +26,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvcommon +#define FT_COMPONENT otvcommon /*************************************************************************/ diff --git a/src/otvalid/otvgdef.c b/src/otvalid/otvgdef.c index 68c00a58c..1f324e961 100644 --- a/src/otvalid/otvgdef.c +++ b/src/otvalid/otvgdef.c @@ -27,7 +27,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvgdef +#define FT_COMPONENT otvgdef /*************************************************************************/ diff --git a/src/otvalid/otvgpos.c b/src/otvalid/otvgpos.c index 17f243719..6ce60073c 100644 --- a/src/otvalid/otvgpos.c +++ b/src/otvalid/otvgpos.c @@ -28,7 +28,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvgpos +#define FT_COMPONENT otvgpos static void diff --git a/src/otvalid/otvgsub.c b/src/otvalid/otvgsub.c index 0180b1a39..18129ed4c 100644 --- a/src/otvalid/otvgsub.c +++ b/src/otvalid/otvgsub.c @@ -27,7 +27,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvgsub +#define FT_COMPONENT otvgsub /*************************************************************************/ diff --git a/src/otvalid/otvjstf.c b/src/otvalid/otvjstf.c index 7a5769afc..989754f59 100644 --- a/src/otvalid/otvjstf.c +++ b/src/otvalid/otvjstf.c @@ -28,7 +28,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvjstf +#define FT_COMPONENT otvjstf #define JstfPriorityFunc otv_JstfPriority_validate diff --git a/src/otvalid/otvmath.c b/src/otvalid/otvmath.c index 4a9f3b067..c7871330b 100644 --- a/src/otvalid/otvmath.c +++ b/src/otvalid/otvmath.c @@ -30,7 +30,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvmath +#define FT_COMPONENT otvmath diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c index 5dd543b1c..5b53daa96 100644 --- a/src/otvalid/otvmod.c +++ b/src/otvalid/otvmod.c @@ -35,7 +35,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_otvmodule +#define FT_COMPONENT otvmodule static FT_Error diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index e2f7e7c77..33d83d397 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -45,7 +45,7 @@ THE SOFTWARE. #include "pcfutil.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pcfread +#define FT_COMPONENT pcfread #include FT_SERVICE_BDF_H #include FT_SERVICE_FONT_FORMAT_H @@ -60,7 +60,7 @@ THE SOFTWARE. * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_pcfdriver +#define FT_COMPONENT pcfdriver /* diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 14cce67b0..3aa6c0bb7 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -44,7 +44,7 @@ THE SOFTWARE. * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_pcfread +#define FT_COMPONENT pcfread #ifdef FT_DEBUG_LEVEL_TRACE diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c index 06723ffe5..9818a2ed9 100644 --- a/src/pfr/pfrgload.c +++ b/src/pfr/pfrgload.c @@ -24,7 +24,7 @@ #include "pfrerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pfr +#define FT_COMPONENT pfr /*************************************************************************/ diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c index e9c00997c..af2a03723 100644 --- a/src/pfr/pfrload.c +++ b/src/pfr/pfrload.c @@ -23,7 +23,7 @@ #include "pfrerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pfr +#define FT_COMPONENT pfr /* diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c index e51a84222..c906c90bc 100644 --- a/src/pfr/pfrobjs.c +++ b/src/pfr/pfrobjs.c @@ -29,7 +29,7 @@ #include "pfrerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pfr +#define FT_COMPONENT pfr /*************************************************************************/ diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index f5d30779e..550c20d74 100644 --- a/src/pfr/pfrsbit.c +++ b/src/pfr/pfrsbit.c @@ -24,7 +24,7 @@ #include "pfrerror.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pfr +#define FT_COMPONENT pfr /*************************************************************************/ diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c index af32f69c4..5732beb8a 100644 --- a/src/psaux/cffdecode.c +++ b/src/psaux/cffdecode.c @@ -35,7 +35,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cffdecode +#define FT_COMPONENT cffdecode #ifdef CFF_CONFIG_OPTION_OLD_ENGINE diff --git a/src/psaux/psblues.c b/src/psaux/psblues.c index e44f3c7ed..89738ce47 100644 --- a/src/psaux/psblues.c +++ b/src/psaux/psblues.c @@ -51,7 +51,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cf2blues +#define FT_COMPONENT cf2blues /* diff --git a/src/psaux/psconv.c b/src/psaux/psconv.c index 74273f7de..d0b661059 100644 --- a/src/psaux/psconv.c +++ b/src/psaux/psconv.c @@ -31,7 +31,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_psconv +#define FT_COMPONENT psconv /* The following array is used by various functions to quickly convert */ diff --git a/src/psaux/pshints.c b/src/psaux/pshints.c index 0a5af316d..1965b2cd7 100644 --- a/src/psaux/pshints.c +++ b/src/psaux/pshints.c @@ -52,7 +52,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cf2hints +#define FT_COMPONENT cf2hints typedef struct CF2_HintMoveRec_ diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c index 2597f8c77..b63bcd4e8 100644 --- a/src/psaux/psintrp.c +++ b/src/psaux/psintrp.c @@ -59,7 +59,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_cf2interp +#define FT_COMPONENT cf2interp FT_LOCAL_DEF( void ) diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 36ee66328..97c9cb16f 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_psobjs +#define FT_COMPONENT psobjs /*************************************************************************/ diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 674560366..f611cf91d 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1decode +#define FT_COMPONENT t1decode typedef enum T1_Operator_ diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c index 925b3d602..63fd4328e 100644 --- a/src/pshinter/pshalgo.c +++ b/src/pshinter/pshalgo.c @@ -26,7 +26,7 @@ #undef FT_COMPONENT -#define FT_COMPONENT trace_pshalgo +#define FT_COMPONENT pshalgo #ifdef DEBUG_HINTER diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c index 50d66ca2b..5cece0531 100644 --- a/src/pshinter/pshrec.c +++ b/src/pshinter/pshrec.c @@ -28,7 +28,7 @@ #include "pshnterr.h" #undef FT_COMPONENT -#define FT_COMPONENT trace_pshrec +#define FT_COMPONENT pshrec #ifdef DEBUG_HINTER PS_Hints ps_debug_hints = NULL; diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 8a583ea5d..5b47d15c9 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -169,7 +169,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_raster +#define FT_COMPONENT raster #ifdef STANDALONE_ diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index ae6d6cdbc..460fc9efa 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -68,7 +68,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_sfdriver +#define FT_COMPONENT sfdriver /* diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 9dfc20e83..a54335dc5 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -48,7 +48,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_sfobjs +#define FT_COMPONENT sfobjs diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c index a85a68766..2a9f4d296 100644 --- a/src/sfnt/ttbdf.c +++ b/src/sfnt/ttbdf.c @@ -34,7 +34,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttbdf +#define FT_COMPONENT ttbdf FT_LOCAL_DEF( void ) diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index a3a8c52f9..da9d86592 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttcmap +#define FT_COMPONENT ttcmap #define TT_PEEK_SHORT FT_PEEK_SHORT diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c index a8ff0261f..8b8263b84 100644 --- a/src/sfnt/ttcolr.c +++ b/src/sfnt/ttcolr.c @@ -77,7 +77,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttcolr +#define FT_COMPONENT ttcolr FT_LOCAL_DEF( FT_Error ) diff --git a/src/sfnt/ttcpal.c b/src/sfnt/ttcpal.c index b4b60e22a..b18f0aa13 100644 --- a/src/sfnt/ttcpal.c +++ b/src/sfnt/ttcpal.c @@ -68,7 +68,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttcpal +#define FT_COMPONENT ttcpal FT_LOCAL_DEF( FT_Error ) diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c index 48ad4173e..02b614ad8 100644 --- a/src/sfnt/ttkern.c +++ b/src/sfnt/ttkern.c @@ -33,7 +33,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttkern +#define FT_COMPONENT ttkern #undef TT_KERN_INDEX diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index f3fed8f7c..a965bb2f2 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -33,7 +33,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttload +#define FT_COMPONENT ttload /************************************************************************** diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c index 8edf4e6a3..69164862d 100644 --- a/src/sfnt/ttmtx.c +++ b/src/sfnt/ttmtx.c @@ -45,7 +45,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttmtx +#define FT_COMPONENT ttmtx /************************************************************************** diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index 714830135..7d64a7816 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -45,7 +45,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttpost +#define FT_COMPONENT ttpost /* If this configuration macro is defined, we rely on the `PSNames' */ diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 209e8b061..0c3ecf6ce 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -43,7 +43,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttsbit +#define FT_COMPONENT ttsbit FT_LOCAL_DEF( FT_Error ) diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 8f2a600ad..e40a30dc6 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -88,7 +88,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_smooth +#define FT_COMPONENT smooth #ifdef STANDALONE_ diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index eac736c4a..a197d6c96 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -51,7 +51,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttdriver +#define FT_COMPONENT ttdriver /* diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 9e98f1169..0a436a2ac 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -45,7 +45,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttgload +#define FT_COMPONENT ttgload /************************************************************************** diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 3df50d630..fef0c8a46 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -85,7 +85,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttgxvar +#define FT_COMPONENT ttgxvar /*************************************************************************/ diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index a86afb9ff..a8b9861e4 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -46,7 +46,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttinterp +#define FT_COMPONENT ttinterp #define NO_SUBPIXEL_HINTING \ diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index df6c72a10..ff1ccece0 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -43,7 +43,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttobjs +#define FT_COMPONENT ttobjs #ifdef TT_USE_BYTECODE_INTERPRETER diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index f7935cfba..53b319ea1 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -38,7 +38,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_ttpload +#define FT_COMPONENT ttpload /************************************************************************** diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 0cbef3bbf..fc01daf50 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -33,7 +33,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1afm +#define FT_COMPONENT t1afm FT_LOCAL_DEF( void ) diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index 4d46e3ee6..3cde1dc6f 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -50,7 +50,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1driver +#define FT_COMPONENT t1driver /* * GLYPH DICT SERVICE diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 87c2a0fd3..e1b10ddba 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -36,7 +36,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1gload +#define FT_COMPONENT t1gload static FT_Error diff --git a/src/type1/t1load.c b/src/type1/t1load.c index a44357134..b16389ab7 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -86,7 +86,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1load +#define FT_COMPONENT t1load #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 05f02d5e6..6cc5ff9ee 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -43,7 +43,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1objs +#define FT_COMPONENT t1objs /************************************************************************** diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 92148314f..145f61650 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -50,7 +50,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t1parse +#define FT_COMPONENT t1parse /*************************************************************************/ diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c index 103650315..00b5fc732 100644 --- a/src/type42/t42drivr.c +++ b/src/type42/t42drivr.c @@ -47,7 +47,7 @@ #include FT_SERVICE_POSTSCRIPT_INFO_H #undef FT_COMPONENT -#define FT_COMPONENT trace_t42 +#define FT_COMPONENT t42 /* diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index 0325cad45..0b265ce1a 100644 --- a/src/type42/t42objs.c +++ b/src/type42/t42objs.c @@ -25,7 +25,7 @@ #undef FT_COMPONENT -#define FT_COMPONENT trace_t42 +#define FT_COMPONENT t42 static FT_Error diff --git a/src/type42/t42parse.c b/src/type42/t42parse.c index 04690f5fc..71db2172f 100644 --- a/src/type42/t42parse.c +++ b/src/type42/t42parse.c @@ -30,7 +30,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_t42 +#define FT_COMPONENT t42 static void diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 70fc82785..b2d76e7de 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -37,7 +37,7 @@ * messages during execution. */ #undef FT_COMPONENT -#define FT_COMPONENT trace_winfnt +#define FT_COMPONENT winfnt static const FT_Frame_Field winmz_header_fields[] = |