marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Use cached values in GPOS functions.

oldstable
Aric Stewart 2012-07-31 08:50:06 -05:00 committed by Alexandre Julliard
parent ef5daa9aa5
commit 7819ce61b5
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/usp10/shape.c
View File

@ -3285,9 +3285,6 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
const TEXTRANGE_PROPERTIES *rpRangeProperties;
int i;
INT dirL;
LPOUTLINETEXTMETRICW lpotm;
LOGFONTW lf;
HFONT hfont;
rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange;
@ -3296,15 +3293,9 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
load_ot_tables(hdc, psc);
if (!psc->GPOS_Table)
if (!psc->GPOS_Table || !psc->otm)
return;
i = GetOutlineTextMetricsW( hdc, 0, NULL);
lpotm = HeapAlloc(GetProcessHeap(),0,i);
GetOutlineTextMetricsW( hdc, i, lpotm);
hfont = GetCurrentObject(hdc, OBJ_FONT);
GetObjectW(hfont, sizeof(lf), &lf);
if (!psa->fLogicalOrder && psa->fRTL)
dirL = -1;
else
@ -3320,7 +3311,7 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
if (!feature)
continue;
GPOS_apply_feature(lpotm, &lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset);
GPOS_apply_feature(psc->otm, &psc->lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset);
}
}
}