forked from minhngoc25a/freetype2
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.
This commit is contained in:
parent
9960e7beab
commit
e361cc6a75
|
@ -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>
|
2018-06-16 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[sfnt] Fix color glyph layer loading.
|
[sfnt] Fix color glyph layer loading.
|
||||||
|
|
|
@ -33,7 +33,7 @@ FT_TRACE_DEF( objs ) /* base objects (ftobjs.c) */
|
||||||
FT_TRACE_DEF( outline ) /* outline management (ftoutln.c) */
|
FT_TRACE_DEF( outline ) /* outline management (ftoutln.c) */
|
||||||
FT_TRACE_DEF( stream ) /* stream manager (ftstream.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( mm ) /* MM interface (ftmm.c) */
|
||||||
FT_TRACE_DEF( psprops ) /* PS driver properties (ftpsprop.c) */
|
FT_TRACE_DEF( psprops ) /* PS driver properties (ftpsprop.c) */
|
||||||
FT_TRACE_DEF( raccess ) /* resource fork accessor (ftrfork.c) */
|
FT_TRACE_DEF( raccess ) /* resource fork accessor (ftrfork.c) */
|
||||||
|
|
|
@ -4619,7 +4619,7 @@
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
|
|
||||||
#undef FT_COMPONENT
|
#undef FT_COMPONENT
|
||||||
#define FT_COMPONENT trace_bitmap
|
#define FT_COMPONENT trace_checksum
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Computing the MD5 checksum is expensive, unnecessarily distorting a
|
* Computing the MD5 checksum is expensive, unnecessarily distorting a
|
||||||
|
@ -4629,9 +4629,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* we use FT_TRACE3 in this block */
|
/* we use FT_TRACE3 in this block */
|
||||||
if ( !error &&
|
if ( !error &&
|
||||||
ft_trace_levels[trace_bitmap] >= 3 &&
|
ft_trace_levels[trace_checksum] >= 3 &&
|
||||||
slot->bitmap.buffer )
|
slot->bitmap.buffer )
|
||||||
{
|
{
|
||||||
FT_Bitmap bitmap;
|
FT_Bitmap bitmap;
|
||||||
FT_Error err;
|
FT_Error err;
|
||||||
|
@ -4681,11 +4681,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* we use FT_TRACE7 in this block */
|
/* we use FT_TRACE7 in this block */
|
||||||
if ( !error &&
|
if ( !error &&
|
||||||
ft_trace_levels[trace_bitmap] >= 7 &&
|
ft_trace_levels[trace_checksum] >= 7 &&
|
||||||
slot->bitmap.rows < 128U &&
|
slot->bitmap.rows < 128U &&
|
||||||
slot->bitmap.width < 128U &&
|
slot->bitmap.width < 128U &&
|
||||||
slot->bitmap.buffer )
|
slot->bitmap.buffer )
|
||||||
{
|
{
|
||||||
int rows = (int)slot->bitmap.rows;
|
int rows = (int)slot->bitmap.rows;
|
||||||
int width = (int)slot->bitmap.width;
|
int width = (int)slot->bitmap.width;
|
||||||
|
|
Loading…
Reference in New Issue