gdi32: Reset ppem to zero if we fail to find a matching height.

d089ca67 · Huw Davies · Alexandre Julliard · bb5aa886 · d089ca67
Commit d089ca67 authored Aug 28, 2013 by Huw Davies Committed by Alexandre Julliard Aug 28, 2013
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

freetype.c dlls/gdi32/freetype.c +6 -0

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4580,14 +4580,20 @@ static LONG load_VDMX(GdiFont *font, LONG height)
 	} else {
 	    ppem = -height;
 	    if(ppem < startsz || ppem > endsz)
+            {
+                ppem = 0;
                goto end;
+            }

 	    for(i = 0; i < recs; i++) {
 		USHORT yPelHeight;
 		yPelHeight = GET_BE_WORD(vTable[i * 3]);

 		if(yPelHeight > ppem)
+                {
+                    ppem = 0;
                    break; /* failed */
+                }

 		if(yPelHeight == ppem) {
 		    font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]);