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

usp10: Simplify the chaining context table assignments in GPOS_apply_ChainContextPos(). 

And avoid some endian conversions in the process.

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-04-05 10:21:27 +02:00 committed by Alexandre Julliard
parent fb3ea0ae05
commit f6c0146499
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/usp10/opentype.c
View File

@ -2226,57 +2226,54 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache,
} }
else if (GET_BE_WORD(backtrack->PosFormat) == 3) else if (GET_BE_WORD(backtrack->PosFormat) == 3)
{ {
WORD backtrack_count, input_count, lookahead_count;
int k; int k;
int indexGlyphs;
const GPOS_ChainContextPosFormat3_2 *input; const GPOS_ChainContextPosFormat3_2 *input;
const GPOS_ChainContextPosFormat3_3 *lookahead; const GPOS_ChainContextPosFormat3_3 *lookahead;
const GPOS_ChainContextPosFormat3_4 *positioning; const GPOS_ChainContextPosFormat3_4 *positioning;
TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n"); TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n");
for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount);
input = (const GPOS_ChainContextPosFormat3_2 *)&backtrack->Coverage[backtrack_count];
input_count = GET_BE_WORD(input->InputGlyphCount);
lookahead = (const GPOS_ChainContextPosFormat3_3 *)&input->Coverage[input_count];
lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount);
positioning = (const GPOS_ChainContextPosFormat3_4 *)&lookahead->Coverage[lookahead_count];
for (k = 0; k < backtrack_count; ++k)
{ {
offset = GET_BE_WORD(backtrack->Coverage[k]); offset = GET_BE_WORD(backtrack->Coverage[k]);
if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset,
glyphs[glyph_index + (dirBacktrack * (k + 1))]) == -1) glyphs[glyph_index + (dirBacktrack * (k + 1))]) == -1)
break; break;
} }
if (k != GET_BE_WORD(backtrack->BacktrackGlyphCount)) if (k != backtrack_count)
continue; continue;
TRACE("Matched Backtrack\n"); TRACE("Matched Backtrack\n");
input = (const GPOS_ChainContextPosFormat3_2 *)((BYTE *)backtrack + for (k = 0; k < input_count; ++k)
FIELD_OFFSET(GPOS_ChainContextPosFormat3_1, Coverage[GET_BE_WORD(backtrack->BacktrackGlyphCount)]));
indexGlyphs = GET_BE_WORD(input->InputGlyphCount);
for (k = 0; k < indexGlyphs; k++)
{ {
offset = GET_BE_WORD(input->Coverage[k]); offset = GET_BE_WORD(input->Coverage[k]);
if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset,
glyphs[glyph_index + (write_dir * k)]) == -1) glyphs[glyph_index + (write_dir * k)]) == -1)
break; break;
} }
if (k != indexGlyphs) if (k != input_count)
continue; continue;
TRACE("Matched IndexGlyphs\n"); TRACE("Matched IndexGlyphs\n");
lookahead = (const GPOS_ChainContextPosFormat3_3 *)((BYTE *)input + for (k = 0; k < lookahead_count; ++k)
FIELD_OFFSET(GPOS_ChainContextPosFormat3_2, Coverage[GET_BE_WORD(input->InputGlyphCount)]));
for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k)
{ {
offset = GET_BE_WORD(lookahead->Coverage[k]); offset = GET_BE_WORD(lookahead->Coverage[k]);
if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset, if (GSUB_is_glyph_covered((const BYTE *)backtrack + offset,
glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) glyphs[glyph_index + (dirLookahead * (input_count + k))]) == -1)
break; break;
} }
if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) if (k != lookahead_count)
continue; continue;
TRACE("Matched LookAhead\n"); TRACE("Matched LookAhead\n");
positioning = (const GPOS_ChainContextPosFormat3_4 *)((BYTE *)lookahead +
FIELD_OFFSET(GPOS_ChainContextPosFormat3_3, Coverage[GET_BE_WORD(lookahead->LookaheadGlyphCount)]));
if (GET_BE_WORD(positioning->PosCount)) if (GET_BE_WORD(positioning->PosCount))
{ {
for (k = 0; k < GET_BE_WORD(positioning->PosCount); ++k) for (k = 0; k < GET_BE_WORD(positioning->PosCount); ++k)
@ -2288,7 +2285,7 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache,
GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex,
glyphs, glyph_index + SequenceIndex, glyph_count, goffset); glyphs, glyph_index + SequenceIndex, glyph_count, goffset);
} }
return indexGlyphs + GET_BE_WORD(lookahead->LookaheadGlyphCount); return input_count + lookahead_count;
} }
else return 1; else return 1;
} }