ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Iterate in visual order in GPOS_apply_feature(). 

In particular, cursive attachment application depends on previous visual order
glyph offsets. Affects e.g. wordpad with Nastaliq fonts.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-02-19 19:02:34 +01:00 committed by Alexandre Julliard
parent 6fec9b1325
commit b6d541cac5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/usp10/shape.c
View File

@ -882,15 +882,17 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W
static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, LoadedFeature *feature, const WORD *glyphs, INT glyph_count, GOFFSET *pGoffset) static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, LoadedFeature *feature, const WORD *glyphs, INT glyph_count, GOFFSET *pGoffset)
{ {
int i; int dir = analysis->fLogicalOrder && analysis->fRTL ? -1 : 1;
unsigned int start_idx, i, j;
TRACE("%i lookups\n", feature->lookup_count); TRACE("%i lookups\n", feature->lookup_count);
start_idx = dir < 0 ? glyph_count - 1 : 0;
for (i = 0; i < feature->lookup_count; i++) for (i = 0; i < feature->lookup_count; i++)
{ {
int j;
for (j = 0; j < glyph_count; ) for (j = 0; j < glyph_count; )
j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance,
feature->lookups[i], glyphs, j, glyph_count, pGoffset); feature->lookups[i], glyphs, start_idx + dir * j, glyph_count, pGoffset);
} }
} }