Fix for sign of font height in non MM_TEXT mode.
Fix GGO_NATIVE again.
This commit is contained in:
parent
d97f7cdecb
commit
bd0a567a2d
|
@ -1063,7 +1063,9 @@ not_found:
|
||||||
debugstr_w(face->StyleName));
|
debugstr_w(face->StyleName));
|
||||||
|
|
||||||
ret->ft_face = OpenFontFile(ret, face->file, face->face_index,
|
ret->ft_face = OpenFontFile(ret, face->file, face->face_index,
|
||||||
INTERNAL_YWSTODS(dc,lf.lfHeight));
|
lf.lfHeight < 0 ?
|
||||||
|
-abs(INTERNAL_YWSTODS(dc,lf.lfHeight)) :
|
||||||
|
abs(INTERNAL_YWSTODS(dc, lf.lfHeight)));
|
||||||
if (!ret->ft_face)
|
if (!ret->ft_face)
|
||||||
{
|
{
|
||||||
free_font( ret );
|
free_font( ret );
|
||||||
|
@ -1590,7 +1592,8 @@ DWORD WineEngGetGlyphOutline(GdiFont font, UINT glyph, UINT format,
|
||||||
if(buf)
|
if(buf)
|
||||||
FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]);
|
FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]);
|
||||||
cpfx++;
|
cpfx++;
|
||||||
} else if(outline->tags[point] & FT_Curve_Tag_On) {
|
} else if(point <= outline->contours[contour] &&
|
||||||
|
outline->tags[point] & FT_Curve_Tag_On) {
|
||||||
/* add closing pt for bezier */
|
/* add closing pt for bezier */
|
||||||
if(buf)
|
if(buf)
|
||||||
FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]);
|
FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]);
|
||||||
|
|
Loading…
Reference in New Issue