* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop.

17 years ago · 3863c95146
parent cd874831dc
commit 3863c95146
2 changed files with 7 additions and 2 deletions
--- a/5
+++ b/5
@ -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,
--- 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;