diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-06-17 09:13:37 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-06-17 09:13:37 +0200 |
| commit | e361cc6a7553ee82abccec3378d208e844f311a4 (patch) | |
| tree | a18f2ae99c5582eeefdc5e9141b53f64e8c88eb0 | |
| parent | 9960e7beabe3fa962fe5a3a020dfd97b40e93f10 (diff) | |
| download | freetype2-e361cc6a7553ee82abccec3378d208e844f311a4.tar.gz | |
s/trace_bitmap/trace_checksum/.
* include/freetype/internal/fttrace.h: s/bitmap/checksum/.
* src/base/ftobjs.c (FT_COMPONENT): s/trace_bitmap/trace_checksum/.
Adjust code.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/freetype/internal/fttrace.h | 2 | ||||
| -rw-r--r-- | src/base/ftobjs.c | 18 |
3 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2018-06-17 Werner Lemberg <wl@gnu.org> + + s/trace_bitmap/trace_checksum/. + + * include/freetype/internal/fttrace.h: s/bitmap/checksum/. + + * src/base/ftobjs.c (FT_COMPONENT): s/trace_bitmap/trace_checksum/. + Adjust code. + 2018-06-16 Werner Lemberg <wl@gnu.org> [sfnt] Fix color glyph layer loading. diff --git a/include/freetype/internal/fttrace.h b/include/freetype/internal/fttrace.h index d7c17d37c..8fac02c7d 100644 --- a/include/freetype/internal/fttrace.h +++ b/include/freetype/internal/fttrace.h @@ -33,7 +33,7 @@ FT_TRACE_DEF( objs ) /* base objects (ftobjs.c) */ FT_TRACE_DEF( outline ) /* outline management (ftoutln.c) */ FT_TRACE_DEF( stream ) /* stream manager (ftstream.c) */ -FT_TRACE_DEF( bitmap ) /* bitmap checksum (ftobjs.c) */ +FT_TRACE_DEF( checksum ) /* bitmap checksum (ftobjs.c) */ FT_TRACE_DEF( mm ) /* MM interface (ftmm.c) */ FT_TRACE_DEF( psprops ) /* PS driver properties (ftpsprop.c) */ FT_TRACE_DEF( raccess ) /* resource fork accessor (ftrfork.c) */ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index e733f955e..38214b5d8 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -4619,7 +4619,7 @@ #ifdef FT_DEBUG_LEVEL_TRACE #undef FT_COMPONENT -#define FT_COMPONENT trace_bitmap +#define FT_COMPONENT trace_checksum /* * Computing the MD5 checksum is expensive, unnecessarily distorting a @@ -4629,9 +4629,9 @@ */ /* we use FT_TRACE3 in this block */ - if ( !error && - ft_trace_levels[trace_bitmap] >= 3 && - slot->bitmap.buffer ) + if ( !error && + ft_trace_levels[trace_checksum] >= 3 && + slot->bitmap.buffer ) { FT_Bitmap bitmap; FT_Error err; @@ -4681,11 +4681,11 @@ */ /* we use FT_TRACE7 in this block */ - if ( !error && - ft_trace_levels[trace_bitmap] >= 7 && - slot->bitmap.rows < 128U && - slot->bitmap.width < 128U && - slot->bitmap.buffer ) + if ( !error && + ft_trace_levels[trace_checksum] >= 7 && + slot->bitmap.rows < 128U && + slot->bitmap.width < 128U && + slot->bitmap.buffer ) { int rows = (int)slot->bitmap.rows; int width = (int)slot->bitmap.width; |