* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop. Patch from Savannah bug #22541.
diff --git a/ChangeLog b/ChangeLog
index 55ba0bf..a34d0d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-13 Derek Clegg <dclegg@apple.com>
+
+ * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop.
+ Patch from Savannah bug #22541.
+
2008-03-03 Masatoshi Kimura <VYV03354@nifty.ne.jp>
* src/sfnt/ttcmap.c (tt_cmap14_char_map_nondef_binary,
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 0dc2c4f..6922a45 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -4,7 +4,7 @@
/* */
/* TrueType GX Font Variation loader */
/* */
-/* Copyright 2004, 2005, 2006, 2007 by */
+/* Copyright 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, Werner Lemberg, and George Williams. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -754,7 +754,7 @@
}
ns = mmvar->namedstyle;
- for ( i = 0; i < fvar_head.instanceCount; ++i )
+ for ( i = 0; i < fvar_head.instanceCount; ++i, ++ns )
{
if ( FT_FRAME_ENTER( 4L + 4L * fvar_head.axisCount ) )
goto Exit;