rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/base/ftdebug.c (ft_log_handler): Fix "-Wunused-parameter" warning. 

* include/freetype/ftlogging.h ( FTLOGGING_H_ ): Added Include guard.

    * src/*: Fixed format specifiers.

    * [priyesh]ChangeLog: Fix typo.
This commit is contained in:
Priyeshkkumar 2020-08-12 14:47:03 +05:30
parent 84c719491f
commit 008ee3ebca
6 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
[priyesh]ChangeLog
View File

@ -1,8 +1,16 @@
2020-08-12 Priyesh Kumar <priyeshkkumar@gmail.com>
* src/base/ftdebug.c (ft_log_handler): Fix "-Wunused-parameter" warning.
* include/freetype/ftlogging.h ( FTLOGGING_H_ ): Added Include guard.
* src/*: Fixed format specifiers.
* [priyesh]ChangeLog: Fix typo.
Bug fix on Windows.
* include/freetype/internal/ftdebug.h: Store the name of current
* include/freetype/internal/ftdebug.h (FT_LOG): Store the name of current
`FT_COMPONENT' and then pass it to the functions `ft_add_tag()' and
`ft_remove_tag()'

8
include/freetype/ftlogging.h
View File

@ -1,5 +1,9 @@
#include FT_CONFIG_CONFIG_H
#ifndef FTLOGGING_H_
#define FTLOGGING_H_
FT_BEGIN_HEADER
/***************************************************************************
@ -40,7 +44,9 @@ FT_BEGIN_HEADER
FT_Set_Log_Handler( ft_custom_log_handler handler );
FT_EXPORT( void )
FT_Set_Default_Log_Handler();
FT_Set_Default_Log_Handler( void );
FT_END_HEADER
#endif /* FTLOGGING_H_ */

1
src/base/ftdebug.c
View File

@ -452,6 +452,7 @@ else
ft_log_handler( const struct dlg_origin* origin,
const char* string, void* data )
{
( void ) data;
static unsigned int features ;
if( ft_timestamp_flag && ft_component_flag && ft_have_newline_char )
features = features_both;

6
src/psaux/cffdecode.c
View File

@ -2153,7 +2153,7 @@
decoder->locals_bias );
FT_TRACE4(( " callsubr (idx %d, entering level %d)\n",
FT_TRACE4(( " callsubr (idx %d, entering level %ld)\n",
idx,
zone - decoder->zones + 1 ));
@ -2197,7 +2197,7 @@
decoder->globals_bias );
FT_TRACE4(( " callgsubr (idx %d, entering level %d)\n",
FT_TRACE4(( " callgsubr (idx %d, entering level %ld)\n",
idx,
zone - decoder->zones + 1 ));
@ -2236,7 +2236,7 @@
break;
case cff_op_return:
FT_TRACE4(( " return (leaving level %d)\n",
FT_TRACE4(( " return (leaving level %ld)\n",
decoder->zone - decoder->zones ));
if ( decoder->zone <= decoder->zones )

6
src/psaux/t1decode.c
View File

@ -517,7 +517,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
if ( bol )
{
FT_TRACE5(( " (%d)", decoder->top - decoder->stack ));
FT_TRACE5(( " (%ld)", decoder->top - decoder->stack ));
bol = FALSE;
}
#endif
@ -1162,7 +1162,7 @@
if ( top - decoder->stack != num_args )
FT_TRACE0(( "t1_decoder_parse_charstrings:"
" too much operands on the stack"
" (seen %d, expected %d)\n",
" (seen %ld, expected %d)\n",
top - decoder->stack, num_args ));
break;
}
@ -1209,7 +1209,7 @@
FT_TRACE4(( "BuildCharArray = [ " ));
for ( i = 0; i < decoder->len_buildchar; i++ )
FT_TRACE4(( "%d ", decoder->buildchar[i] ));
FT_TRACE4(( "%ld ", decoder->buildchar[i] ));
FT_TRACE4(( "]\n" ));
}

2
src/truetype/ttinterp.c
View File

@ -3781,7 +3781,7 @@
if ( opcode_pointer[i] == opcode_size[i] )
{
FT_TRACE6(( "sph: Function %d, opcode ptrn: %d, %s %s\n",
FT_TRACE6(( "sph: Function %d, opcode ptrn: %ld, %s %s\n",
i, n,
exc->face->root.family_name,
exc->face->root.style_name ));