[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master a0dd16f: Don't use `trace_' prefix for FT_COMPONENT a
|
From: |
Werner LEMBERG |
|
Subject: |
[freetype2] master a0dd16f: Don't use `trace_' prefix for FT_COMPONENT arguments. |
|
Date: |
Wed, 15 Aug 2018 12:13:49 -0400 (EDT) |
branch: master
commit a0dd16fb3d76e36c8ebc3edf043ddbc0d3a51b5d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
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.
---
ChangeLog | 10 ++++++++++
include/freetype/internal/ftdebug.h | 14 +++++++++-----
src/autofit/afcjk.c | 2 +-
src/autofit/afglobal.c | 2 +-
src/autofit/afhints.c | 2 +-
src/autofit/aflatin.c | 2 +-
src/autofit/aflatin2.c | 2 +-
src/autofit/afmodule.c | 4 ++--
src/autofit/afshaper.c | 2 +-
src/autofit/afwarp.c | 2 +-
src/base/ftbitmap.c | 2 +-
src/base/ftcalc.c | 2 +-
src/base/ftgloadr.c | 2 +-
src/base/ftglyph.c | 2 +-
src/base/ftinit.c | 2 +-
src/base/ftmm.c | 2 +-
src/base/ftobjs.c | 14 +++++++-------
src/base/ftoutln.c | 2 +-
src/base/ftpsprop.c | 2 +-
src/base/ftrfork.c | 2 +-
src/base/ftstream.c | 2 +-
src/base/ftsynth.c | 2 +-
src/base/ftsystem.c | 2 +-
src/base/ftutil.c | 4 ++--
src/bdf/bdfdrivr.c | 2 +-
src/bdf/bdflib.c | 2 +-
src/cache/ftcbasic.c | 2 +-
src/cache/ftccache.c | 2 +-
src/cache/ftccmap.c | 2 +-
src/cache/ftcmanag.c | 2 +-
src/cache/ftcsbits.c | 2 +-
src/cff/cffdrivr.c | 2 +-
src/cff/cffgload.c | 2 +-
src/cff/cffload.c | 2 +-
src/cff/cffobjs.c | 2 +-
src/cff/cffparse.c | 4 ++--
src/cid/cidgload.c | 2 +-
src/cid/cidload.c | 2 +-
src/cid/cidobjs.c | 2 +-
src/cid/cidparse.c | 2 +-
src/cid/cidriver.c | 2 +-
src/gxvalid/gxvbsln.c | 2 +-
src/gxvalid/gxvcommn.c | 2 +-
src/gxvalid/gxvfeat.c | 2 +-
src/gxvalid/gxvjust.c | 2 +-
src/gxvalid/gxvkern.c | 2 +-
src/gxvalid/gxvlcar.c | 2 +-
src/gxvalid/gxvmod.c | 2 +-
src/gxvalid/gxvmort.c | 2 +-
src/gxvalid/gxvmort0.c | 2 +-
src/gxvalid/gxvmort1.c | 2 +-
src/gxvalid/gxvmort2.c | 2 +-
src/gxvalid/gxvmort4.c | 2 +-
src/gxvalid/gxvmort5.c | 2 +-
src/gxvalid/gxvmorx.c | 2 +-
src/gxvalid/gxvmorx0.c | 2 +-
src/gxvalid/gxvmorx1.c | 2 +-
src/gxvalid/gxvmorx2.c | 2 +-
src/gxvalid/gxvmorx4.c | 2 +-
src/gxvalid/gxvmorx5.c | 2 +-
src/gxvalid/gxvopbd.c | 2 +-
src/gxvalid/gxvprop.c | 2 +-
src/gxvalid/gxvtrak.c | 2 +-
src/otvalid/otvbase.c | 2 +-
src/otvalid/otvcommn.c | 2 +-
src/otvalid/otvgdef.c | 2 +-
src/otvalid/otvgpos.c | 2 +-
src/otvalid/otvgsub.c | 2 +-
src/otvalid/otvjstf.c | 2 +-
src/otvalid/otvmath.c | 2 +-
src/otvalid/otvmod.c | 2 +-
src/pcf/pcfdrivr.c | 4 ++--
src/pcf/pcfread.c | 2 +-
src/pfr/pfrgload.c | 2 +-
src/pfr/pfrload.c | 2 +-
src/pfr/pfrobjs.c | 2 +-
src/pfr/pfrsbit.c | 2 +-
src/psaux/cffdecode.c | 2 +-
src/psaux/psblues.c | 2 +-
src/psaux/psconv.c | 2 +-
src/psaux/pshints.c | 2 +-
src/psaux/psintrp.c | 2 +-
src/psaux/psobjs.c | 2 +-
src/psaux/t1decode.c | 2 +-
src/pshinter/pshalgo.c | 2 +-
src/pshinter/pshrec.c | 2 +-
src/raster/ftraster.c | 2 +-
src/sfnt/sfdriver.c | 2 +-
src/sfnt/sfobjs.c | 2 +-
src/sfnt/ttbdf.c | 2 +-
src/sfnt/ttcmap.c | 2 +-
src/sfnt/ttcolr.c | 2 +-
src/sfnt/ttcpal.c | 2 +-
src/sfnt/ttkern.c | 2 +-
src/sfnt/ttload.c | 2 +-
src/sfnt/ttmtx.c | 2 +-
src/sfnt/ttpost.c | 2 +-
src/sfnt/ttsbit.c | 2 +-
src/smooth/ftgrays.c | 2 +-
src/truetype/ttdriver.c | 2 +-
src/truetype/ttgload.c | 2 +-
src/truetype/ttgxvar.c | 2 +-
src/truetype/ttinterp.c | 2 +-
src/truetype/ttobjs.c | 2 +-
src/truetype/ttpload.c | 2 +-
src/type1/t1afm.c | 2 +-
src/type1/t1driver.c | 2 +-
src/type1/t1gload.c | 2 +-
src/type1/t1load.c | 2 +-
src/type1/t1objs.c | 2 +-
src/type1/t1parse.c | 2 +-
src/type42/t42drivr.c | 2 +-
src/type42/t42objs.c | 2 +-
src/type42/t42parse.c | 2 +-
src/winfonts/winfnt.c | 2 +-
115 files changed, 142 insertions(+), 128 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f09df7..33ab977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-08-15 Werner Lemberg <address@hidden>
+
+ 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 <address@hidden>
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 d6e8a3a..34f8a00 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 dc38153..ef02ed0 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 9e7764b..f40b5af 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 65f0e85..171ceb8 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 a90fc1c..21f6669 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 c5ce043..2576708 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 7f9f043..79bc84d 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 b2f5d18..486d713 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 636f01f..2e9d146 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 dc28c40..c04eec4 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 2cea03c..f110c9e 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 475d5cc..3efa461 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 8bc86a5..a752dbd 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 e0f2ccd..f25d80a 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 b0d9d4b..54ab9e7 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 2b44405..e5389ef 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 611b4f6..2266ce1 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 9c5344a..e2c3437 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 c61765b..2740cf4 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 9c8cab3..8a7affa 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 5539105..ec7b935 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 d761ad9..8fffe48 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 eced7bb..403f969 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 8e17bf5..fee6110 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 8133bc6..e6a4682 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 f2b75ee..7589ec3 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 a9aa5d4..8901472 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 47b8b76..1e2269b 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 9be1773..adb0791 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 c802bf0..43bb25a 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 997a734..2789d20 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 88f5689..c4d7ddb 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 015b2c8..1454ec4 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 b3f0f99..391d188 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 4b2ecc5..e152c93 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 e47cd99..36ccee5 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 1546926..31e6f7e 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 91c4ed9..72be8e5 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 861c157..9c9f1ca 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 935c112..6d0594e 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 8b554fd..278093e 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 4d8a4a2..fba2a97 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 91500bd..7a9c9b0 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 c8a9ab6..02d36e7 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 df9f10e..84eb366 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 fd167f6..d426a3a 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 847e0f1..24c1bc1 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 1dfa5a3..2e94894 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 c7901cb..6e905e7 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 f2f4f57..1fade00 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 33fea0f..28dd264 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 6cf1e80..66737e6 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 ae94e22..d169fa6 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 f02ff54..be15f80 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 d65ced5..f3da055 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 1c8da1b..8fc7977 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 d20fc57..1b7fb16 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 fce219c..28ce5fc 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 8826954..123da06 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 76b6961..4e284fb 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 856dd10..6f8fb20 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 d2ceb66..d0012db 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 918e383..a212b95 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 4a2c95e..ddfdb8a 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 68c00a5..1f324e9 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 17f2437..6ce6007 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 0180b1a..18129ed 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 7a5769a..989754f 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 4a9f3b0..c787133 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 5dd543b..5b53daa 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 e2f7e7c..33d83d3 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 14cce67..3aa6c0b 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 06723ff..9818a2e 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 e9c0099..af2a037 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 e51a842..c906c90 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 f5d3077..550c20d 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 af32f69..5732beb 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 e44f3c7..89738ce 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 74273f7..d0b6610 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 0a5af31..1965b2c 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 2597f8c..b63bcd4 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 36ee663..97c9cb1 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 6745603..f611cf9 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 925b3d6..63fd432 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 50d66ca..5cece05 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 8a583ea..5b47d15 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 ae6d6cd..460fc9e 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 9dfc20e..a54335d 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 a85a687..2a9f4d2 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 a3a8c52..da9d865 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 a8ff026..8b8263b 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 b4b60e2..b18f0aa 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 48ad417..02b614a 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 f3fed8f..a965bb2 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 8edf4e6..6916486 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 7148301..7d64a78 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 209e8b0..0c3ecf6 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 8f2a600..e40a30d 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 eac736c..a197d6c 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 9e98f11..0a436a2 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 3df50d6..fef0c8a 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 a86afb9..a8b9861 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 df6c72a..ff1ccec 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 f7935cf..53b319e 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 0cbef3b..fc01daf 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 4d46e3e..3cde1dc 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 87c2a0f..e1b10dd 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 a443571..b16389a 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 05f02d5..6cc5ff9 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 9214831..145f616 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 1036503..00b5fc7 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 0325cad..0b265ce 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 04690f5..71db217 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 70fc827..b2d76e7 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[] =
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master a0dd16f: Don't use `trace_' prefix for FT_COMPONENT arguments.,
Werner LEMBERG <=