Minor clang++ fixes.

* src/base/ftobjs.c (FT_Add_Module), src/psaux/psobjs.c
(ps_parser_load_field), src/type1/t1load.c (parse_subrs): Add
initializer.

* src/cache/ftccache.h (FTC_CACHE_TRYLOOP_END): Avoid implicit
conversion from NULL to boolean.
This commit is contained in:
Werner Lemberg 2016-05-21 11:20:42 +02:00
parent 6e80a098e7
commit d583561e1d
5 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,14 @@
2016-05-21 Werner Lemberg <wl@gnu.org>
Minor clang++ fixes.
* src/base/ftobjs.c (FT_Add_Module), src/psaux/psobjs.c
(ps_parser_load_field), src/type1/t1load.c (parse_subrs): Add
initializer.
* src/cache/ftccache.h (FTC_CACHE_TRYLOOP_END): Avoid implicit
conversion from NULL to boolean.
2016-05-21 Werner Lemberg <wl@gnu.org>
Work around a bug of the C 8.0.0.1 compiler on AIX 5.3 (#47955).

View File

@ -4323,7 +4323,7 @@
{
FT_Error error;
FT_Memory memory;
FT_Module module;
FT_Module module = NULL;
FT_UInt nn;

View File

@ -325,7 +325,7 @@ FT_BEGIN_HEADER
break; \
\
_try_done = FTC_Manager_FlushN( _try_manager, _try_count ); \
if ( _try_done > 0 && ( list_changed ) ) \
if ( _try_done > 0 && ( list_changed != NULL ) ) \
*(FT_Bool*)( list_changed ) = TRUE; \
\
if ( _try_done == 0 ) \

View File

@ -1087,9 +1087,9 @@
for ( ; count > 0; count--, idx++ )
{
FT_Byte* q = (FT_Byte*)objects[idx] + field->offset;
FT_Byte* q = (FT_Byte*)objects[idx] + field->offset;
FT_Long val;
FT_String* string;
FT_String* string = NULL;
skip_spaces( &cur, limit );
@ -1217,7 +1217,7 @@
case T1_FIELD_TYPE_MM_BBOX:
{
FT_Memory memory = parser->memory;
FT_Fixed* temp;
FT_Fixed* temp = NULL;
FT_Int result;
FT_UInt i;

View File

@ -1544,7 +1544,7 @@
/* */
if ( face->type1.private_dict.lenIV >= 0 )
{
FT_Byte* temp;
FT_Byte* temp = NULL;
/* some fonts define empty subr records -- this is not totally */
@ -1748,7 +1748,7 @@
if ( face->type1.private_dict.lenIV >= 0 &&
n < num_glyphs + TABLE_EXTEND )
{
FT_Byte* temp;
FT_Byte* temp = NULL;
if ( size <= (FT_ULong)face->type1.private_dict.lenIV )