Kaydet (Commit) 30a98a58 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann Kaydeden (comit) Caolán McNamara

limit next codepoint index to the minindex..endindex bounds

Patch by: hdu

(cherry picked from commit 6115cd0b)

Change-Id: I62265b3021f86bee1f78a79a2c668c1ce09c5521
üst dbc7c605
......@@ -1731,15 +1731,23 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
mnLevel = nLevel;
// merge the fallback levels
// prepare merge the fallback levels
long nXPos = 0;
double fUnitMul = 1.0;
for( n = 0; n < nLevel; ++n )
maFallbackRuns[n].ResetPos();
// get the next codepoint index that needs fallback
// and limit it to the minindex..endindex bounds
int nActiveCharPos = nCharPos[0];
if( nActiveCharPos < mnMinCharPos)
nActiveCharPos = mnMinCharPos;
else if( nActiveCharPos >= rArgs.mnEndCharPos )
nActiveCharPos = rArgs.mnEndCharPos - 1;
// get the end index of the active run
int nLastRunEndChar = (vRtl[nActiveCharPos - mnMinCharPos])?
rArgs.mnEndCharPos : rArgs.mnMinCharPos - 1;
int nRunVisibleEndChar = nCharPos[0];
// merge the fallback levels
while( nValid[0] && (nLevel > 0))
{
// find best fallback level
......
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