[PATCH] Simplify the setting of a loop end condition.

Jeremy White jwhite at codeweavers.com
Thu Oct 9 12:23:09 CDT 2008


---
 dlls/gdi32/freetype.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 02adeea..0baf822 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1358,6 +1358,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
 
         if (! GetFtFace(file, font_data_ptr, font_data_size, fake_family, flags, face_index, &ft_face))
             return 0;
+        num_faces = ft_face->num_faces;
 
         if(FT_IS_SFNT(ft_face))
            pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head);
@@ -1370,7 +1371,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
             {
                 TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index);
                 HeapFree(GetProcessHeap(), 0, localised_family);
-                num_faces = ft_face->num_faces;
                 pFT_Done_Face(ft_face);
                 continue;
             }
@@ -1537,7 +1537,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
 
         } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes);
 
-	num_faces = ft_face->num_faces;
 	pFT_Done_Face(ft_face);
 	TRACE("Added font %s %s\n", debugstr_w(family->FamilyName),
 	      debugstr_w(StyleW));
-- 
1.5.3.6


--------------090801060605020700020201
Content-Type: text/x-patch;
 name="0004-Refactor-AddFontToList-to-clarify-function-and-to-e.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0004-Refactor-AddFontToList-to-clarify-function-and-to-e.pat";
 filename*1="ch"



More information about the wine-devel mailing list