From c6a14086d27fba8778fbce21efc6b6e069a6c701 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 12 Feb 2007 22:08:15 +0000 Subject: [PATCH] * src/truetype/ttinterp.c (Project_x, Project_y): Remove compiler warnings. * src/pcf/pcfread.c (pcf_interpret_style), src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto. --- ChangeLog | 8 ++++++++ src/bdf/bdfdrivr.c | 5 +++-- src/pcf/pcfread.c | 5 +++-- src/truetype/ttinterp.c | 4 +++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa968ed80..0c0ac6278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-02-12 Werner Lemberg + + * src/truetype/ttinterp.c (Project_x, Project_y): Remove compiler + warnings. + + * src/pcf/pcfread.c (pcf_interpret_style), src/bdf/bdfdrivr.c + (bdf_interpret_style): Ditto. + 2007-02-12 David Turner Simplify projection and dual-projection code interface. diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 30580c566..74cc2f1b8 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -248,7 +248,7 @@ THE SOFTWARE. if ( len == 0 ) { - strings[0] = "Regular"; + strings[0] = (char *)"Regular"; lengths[0] = ft_strlen( strings[0] ); len = lengths[0] + 1; } @@ -265,9 +265,10 @@ THE SOFTWARE. for ( nn = 0; nn < 4; nn++ ) { char* src = strings[nn]; - int len = lengths[nn]; + len = lengths[nn]; + if ( src == NULL ) continue; diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 2a142fca4..b9123cf57 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -1039,7 +1039,7 @@ THE SOFTWARE. if ( len == 0 ) { - strings[0] = "Regular"; + strings[0] = (char *)"Regular"; lengths[0] = ft_strlen( strings[0] ); len = lengths[0] + 1; } @@ -1056,9 +1056,10 @@ THE SOFTWARE. for ( nn = 0; nn < 4; nn++ ) { char* src = strings[nn]; - int len = lengths[nn]; + len = lengths[nn]; + if ( src == NULL ) continue; diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 3b5d36eeb..1e89923cd 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -1858,9 +1858,9 @@ { FT_F26Dot6 val; - FT_UNUSED_EXEC; + if ( distance >= 0 ) { val = distance + compensation + 63; @@ -2217,6 +2217,7 @@ FT_Pos dy ) { FT_UNUSED_EXEC; + FT_UNUSED( dy ); return dx; } @@ -2243,6 +2244,7 @@ FT_Pos dy ) { FT_UNUSED_EXEC; + FT_UNUSED( dx ); return dy; }