Skip to content

W
wine-cw
Commit f6794909 authored by Troy Rollo's avatar Troy Rollo Committed by Alexandre Julliard
Browse files
Options

Don't refuse to process VDMX ratio entries with bCharSet == 0. These

entries are at least as useful as those with bCharSet == 1. Add comment containing URL of documentation for VDMX records.
parent aee4f25e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/gdi/freetype.c
View file @ f6794909
...@@ -1425,6 +1425,10 @@ static LONG load_VDMX(GdiFont font, LONG height) ...@@ -1425,6 +1425,10 @@ static LONG load_VDMX(GdiFont font, LONG height)
LONG ppem = 0; LONG ppem = 0;
int i; int i;
/* For documentation on VDMX records, see
* http://www.microsoft.com/OpenType/OTSpec/vdmx.htm
*/
result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6); result = WineEngGetFontData(font, MS_VDMX_TAG, 0, hdr, 6);
if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */
...@@ -1447,9 +1451,6 @@ static LONG load_VDMX(GdiFont font, LONG height) ...@@ -1447,9 +1451,6 @@ static LONG load_VDMX(GdiFont font, LONG height)
TRACE("Ratios[%d] %d %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio); TRACE("Ratios[%d] %d %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio);
if(ratio.bCharSet != 1)
continue;
if((ratio.xRatio == 0 && if((ratio.xRatio == 0 &&
ratio.yStartRatio == 0 && ratio.yStartRatio == 0 &&
ratio.yEndRatio == 0) || ratio.yEndRatio == 0) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment