* src/truetype/ttgxvar.c (TT_Set_MM_Blend): Disambiguate
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/ChangeLog b/ChangeLog
index 20ff3f6..b915fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-16 David Turner <david@freetype.org>
+
+ * src/truetype/ttgxvar.c (TT_Set_MM_Blend): Disambiguate for
+ meddlesome compilers' warning against `for ( ...; ...; ...) ;'.
+
2008-10-14 Werner Lemberg <wl@gnu.org>
* src/cff/cffobjs.c (cff_face_init): Remove compiler warning.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 02bc363..515e734 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 */