From 6922266b2cae8a3ebb751a71ba2068d28fcaf449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Wed, 15 Oct 2008 15:22:39 +0000 Subject: [PATCH] * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Disambiguate --- ChangeLog | 5 +++++ src/truetype/ttgxvar.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20ff3f608..b915fe041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-16 David Turner + + * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Disambiguate for + meddlesome compilers' warning against `for ( ...; ...; ...) ;'. + 2008-10-14 Werner Lemberg * src/cff/cffobjs.c (cff_face_init): Remove compiler warning. diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 02bc363fc..515e734b8 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -905,14 +905,15 @@ } else { - for ( i = 0; - i < num_coords && blend->normalizedcoords[i] == coords[i]; - ++i ) - ; - if ( i == num_coords ) - manageCvt = mcvt_retain; - else - manageCvt = mcvt_load; + manageCvt = mcvt_retain; + for ( i = 0; i < num_coords; ++i ) + { + if ( blend->normalizedcoords[i] != coords[i] ) + { + manageCvt = mcvt_load; + break; + } + } /* If we don't change the blend coords then we don't need to do */ /* anything to the cvt table. It will be correct. Otherwise we */