minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

s/index/idx/ where appropriate.

This commit is contained in:
Werner Lemberg 2017-03-27 21:00:17 +02:00
parent 208e712de0
commit 4c1b5dc152
1 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/cff/cf2intrp.c
View File

@ -333,14 +333,14 @@
FT_Bool doConditionalLastRead ) FT_Bool doConditionalLastRead )
{ {
CF2_Fixed vals[14]; CF2_Fixed vals[14];
CF2_UInt index; CF2_UInt idx;
FT_Bool isHFlex; FT_Bool isHFlex;
CF2_Int top, i, j; CF2_Int top, i, j;
vals[0] = *curX; vals[0] = *curX;
vals[1] = *curY; vals[1] = *curY;
index = 0; idx = 0;
isHFlex = FT_BOOL( readFromStack[9] == FALSE ); isHFlex = FT_BOOL( readFromStack[9] == FALSE );
top = isHFlex ? 9 : 10; top = isHFlex ? 9 : 10;
@ -348,7 +348,7 @@
{ {
vals[i + 2] = vals[i]; vals[i + 2] = vals[i];
if ( readFromStack[i] ) if ( readFromStack[i] )
vals[i + 2] += cf2_stack_getReal( opStack, index++ ); vals[i + 2] += cf2_stack_getReal( opStack, idx++ );
} }
if ( isHFlex ) if ( isHFlex )
@ -358,7 +358,7 @@
{ {
FT_Bool lastIsX = (FT_Bool)( cf2_fixedAbs( vals[10] - *curX ) > FT_Bool lastIsX = (FT_Bool)( cf2_fixedAbs( vals[10] - *curX ) >
cf2_fixedAbs( vals[11] - *curY ) ); cf2_fixedAbs( vals[11] - *curY ) );
CF2_Fixed lastVal = cf2_stack_getReal( opStack, index ); CF2_Fixed lastVal = cf2_stack_getReal( opStack, idx );
if ( lastIsX ) if ( lastIsX )
@ -375,12 +375,12 @@
else else
{ {
if ( readFromStack[10] ) if ( readFromStack[10] )
vals[12] = vals[10] + cf2_stack_getReal( opStack, index++ ); vals[12] = vals[10] + cf2_stack_getReal( opStack, idx++ );
else else
vals[12] = *curX; vals[12] = *curX;
if ( readFromStack[11] ) if ( readFromStack[11] )
vals[13] = vals[11] + cf2_stack_getReal( opStack, index ); vals[13] = vals[11] + cf2_stack_getReal( opStack, idx );
else else
vals[13] = *curY; vals[13] = *curY;
} }
@ -775,16 +775,16 @@
case cf2_cmdRLINETO: case cf2_cmdRLINETO:
{ {
CF2_UInt index; CF2_UInt idx;
CF2_UInt count = cf2_stack_count( opStack ); CF2_UInt count = cf2_stack_count( opStack );
FT_TRACE4(( " rlineto\n" )); FT_TRACE4(( " rlineto\n" ));
for ( index = 0; index < count; index += 2 ) for ( idx = 0; idx < count; idx += 2 )
{ {
curX += cf2_stack_getReal( opStack, index + 0 ); curX += cf2_stack_getReal( opStack, idx + 0 );
curY += cf2_stack_getReal( opStack, index + 1 ); curY += cf2_stack_getReal( opStack, idx + 1 );
cf2_glyphpath_lineTo( &glyphPath, curX, curY ); cf2_glyphpath_lineTo( &glyphPath, curX, curY );
} }
@ -796,7 +796,7 @@
case cf2_cmdHLINETO: case cf2_cmdHLINETO:
case cf2_cmdVLINETO: case cf2_cmdVLINETO:
{ {
CF2_UInt index; CF2_UInt idx;
CF2_UInt count = cf2_stack_count( opStack ); CF2_UInt count = cf2_stack_count( opStack );
FT_Bool isX = FT_BOOL( op1 == cf2_cmdHLINETO ); FT_Bool isX = FT_BOOL( op1 == cf2_cmdHLINETO );
@ -804,9 +804,9 @@
FT_TRACE4(( isX ? " hlineto\n" : " vlineto\n" )); FT_TRACE4(( isX ? " hlineto\n" : " vlineto\n" ));
for ( index = 0; index < count; index++ ) for ( idx = 0; idx < count; idx++ )
{ {
CF2_Fixed v = cf2_stack_getReal( opStack, index ); CF2_Fixed v = cf2_stack_getReal( opStack, idx );
if ( isX ) if ( isX )
@ -827,33 +827,33 @@
case cf2_cmdRRCURVETO: case cf2_cmdRRCURVETO:
{ {
CF2_UInt count = cf2_stack_count( opStack ); CF2_UInt count = cf2_stack_count( opStack );
CF2_UInt index = 0; CF2_UInt idx = 0;
FT_TRACE4(( op1 == cf2_cmdRCURVELINE ? " rcurveline\n" FT_TRACE4(( op1 == cf2_cmdRCURVELINE ? " rcurveline\n"
: " rrcurveto\n" )); : " rrcurveto\n" ));
while ( index + 6 <= count ) while ( idx + 6 <= count )
{ {
CF2_Fixed x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; CF2_Fixed x1 = cf2_stack_getReal( opStack, idx + 0 ) + curX;
CF2_Fixed y1 = cf2_stack_getReal( opStack, index + 1 ) + curY; CF2_Fixed y1 = cf2_stack_getReal( opStack, idx + 1 ) + curY;
CF2_Fixed x2 = cf2_stack_getReal( opStack, index + 2 ) + x1; CF2_Fixed x2 = cf2_stack_getReal( opStack, idx + 2 ) + x1;
CF2_Fixed y2 = cf2_stack_getReal( opStack, index + 3 ) + y1; CF2_Fixed y2 = cf2_stack_getReal( opStack, idx + 3 ) + y1;
CF2_Fixed x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; CF2_Fixed x3 = cf2_stack_getReal( opStack, idx + 4 ) + x2;
CF2_Fixed y3 = cf2_stack_getReal( opStack, index + 5 ) + y2; CF2_Fixed y3 = cf2_stack_getReal( opStack, idx + 5 ) + y2;
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
curX = x3; curX = x3;
curY = y3; curY = y3;
index += 6; idx += 6;
} }
if ( op1 == cf2_cmdRCURVELINE ) if ( op1 == cf2_cmdRCURVELINE )
{ {
curX += cf2_stack_getReal( opStack, index + 0 ); curX += cf2_stack_getReal( opStack, idx + 0 );
curY += cf2_stack_getReal( opStack, index + 1 ); curY += cf2_stack_getReal( opStack, idx + 1 );
cf2_glyphpath_lineTo( &glyphPath, curX, curY ); cf2_glyphpath_lineTo( &glyphPath, curX, curY );
} }
@ -1600,35 +1600,35 @@
case cf2_cmdRLINECURVE: case cf2_cmdRLINECURVE:
{ {
CF2_UInt count = cf2_stack_count( opStack ); CF2_UInt count = cf2_stack_count( opStack );
CF2_UInt index = 0; CF2_UInt idx = 0;
FT_TRACE4(( " rlinecurve\n" )); FT_TRACE4(( " rlinecurve\n" ));
while ( index + 6 < count ) while ( idx + 6 < count )
{ {
curX += cf2_stack_getReal( opStack, index + 0 ); curX += cf2_stack_getReal( opStack, idx + 0 );
curY += cf2_stack_getReal( opStack, index + 1 ); curY += cf2_stack_getReal( opStack, idx + 1 );
cf2_glyphpath_lineTo( &glyphPath, curX, curY ); cf2_glyphpath_lineTo( &glyphPath, curX, curY );
index += 2; idx += 2;
} }
while ( index < count ) while ( idx < count )
{ {
CF2_Fixed x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; CF2_Fixed x1 = cf2_stack_getReal( opStack, idx + 0 ) + curX;
CF2_Fixed y1 = cf2_stack_getReal( opStack, index + 1 ) + curY; CF2_Fixed y1 = cf2_stack_getReal( opStack, idx + 1 ) + curY;
CF2_Fixed x2 = cf2_stack_getReal( opStack, index + 2 ) + x1; CF2_Fixed x2 = cf2_stack_getReal( opStack, idx + 2 ) + x1;
CF2_Fixed y2 = cf2_stack_getReal( opStack, index + 3 ) + y1; CF2_Fixed y2 = cf2_stack_getReal( opStack, idx + 3 ) + y1;
CF2_Fixed x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; CF2_Fixed x3 = cf2_stack_getReal( opStack, idx + 4 ) + x2;
CF2_Fixed y3 = cf2_stack_getReal( opStack, index + 5 ) + y2; CF2_Fixed y3 = cf2_stack_getReal( opStack, idx + 5 ) + y2;
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
curX = x3; curX = x3;
curY = y3; curY = y3;
index += 6; idx += 6;
} }
cf2_stack_clear( opStack ); cf2_stack_clear( opStack );
@ -1638,42 +1638,42 @@
case cf2_cmdVVCURVETO: case cf2_cmdVVCURVETO:
{ {
CF2_UInt count, count1 = cf2_stack_count( opStack ); CF2_UInt count, count1 = cf2_stack_count( opStack );
CF2_UInt index = 0; CF2_UInt idx = 0;
/* if `cf2_stack_count' isn't of the form 4n or 4n+1, */ /* if `cf2_stack_count' isn't of the form 4n or 4n+1, */
/* we enforce it by clearing the second bit */ /* we enforce it by clearing the second bit */
/* (and sorting the stack indexing to suit) */ /* (and sorting the stack indexing to suit) */
count = count1 & ~2U; count = count1 & ~2U;
index += count1 - count; idx += count1 - count;
FT_TRACE4(( " vvcurveto\n" )); FT_TRACE4(( " vvcurveto\n" ));
while ( index < count ) while ( idx < count )
{ {
CF2_Fixed x1, y1, x2, y2, x3, y3; CF2_Fixed x1, y1, x2, y2, x3, y3;
if ( ( count - index ) & 1 ) if ( ( count - idx ) & 1 )
{ {
x1 = cf2_stack_getReal( opStack, index ) + curX; x1 = cf2_stack_getReal( opStack, idx ) + curX;
index++; idx++;
} }
else else
x1 = curX; x1 = curX;
y1 = cf2_stack_getReal( opStack, index + 0 ) + curY; y1 = cf2_stack_getReal( opStack, idx + 0 ) + curY;
x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; x2 = cf2_stack_getReal( opStack, idx + 1 ) + x1;
y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; y2 = cf2_stack_getReal( opStack, idx + 2 ) + y1;
x3 = x2; x3 = x2;
y3 = cf2_stack_getReal( opStack, index + 3 ) + y2; y3 = cf2_stack_getReal( opStack, idx + 3 ) + y2;
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
curX = x3; curX = x3;
curY = y3; curY = y3;
index += 4; idx += 4;
} }
cf2_stack_clear( opStack ); cf2_stack_clear( opStack );
@ -1683,42 +1683,42 @@
case cf2_cmdHHCURVETO: case cf2_cmdHHCURVETO:
{ {
CF2_UInt count, count1 = cf2_stack_count( opStack ); CF2_UInt count, count1 = cf2_stack_count( opStack );
CF2_UInt index = 0; CF2_UInt idx = 0;
/* if `cf2_stack_count' isn't of the form 4n or 4n+1, */ /* if `cf2_stack_count' isn't of the form 4n or 4n+1, */
/* we enforce it by clearing the second bit */ /* we enforce it by clearing the second bit */
/* (and sorting the stack indexing to suit) */ /* (and sorting the stack indexing to suit) */
count = count1 & ~2U; count = count1 & ~2U;
index += count1 - count; idx += count1 - count;
FT_TRACE4(( " hhcurveto\n" )); FT_TRACE4(( " hhcurveto\n" ));
while ( index < count ) while ( idx < count )
{ {
CF2_Fixed x1, y1, x2, y2, x3, y3; CF2_Fixed x1, y1, x2, y2, x3, y3;
if ( ( count - index ) & 1 ) if ( ( count - idx ) & 1 )
{ {
y1 = cf2_stack_getReal( opStack, index ) + curY; y1 = cf2_stack_getReal( opStack, idx ) + curY;
index++; idx++;
} }
else else
y1 = curY; y1 = curY;
x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; x1 = cf2_stack_getReal( opStack, idx + 0 ) + curX;
x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; x2 = cf2_stack_getReal( opStack, idx + 1 ) + x1;
y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; y2 = cf2_stack_getReal( opStack, idx + 2 ) + y1;
x3 = cf2_stack_getReal( opStack, index + 3 ) + x2; x3 = cf2_stack_getReal( opStack, idx + 3 ) + x2;
y3 = y2; y3 = y2;
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
curX = x3; curX = x3;
curY = y3; curY = y3;
index += 4; idx += 4;
} }
cf2_stack_clear( opStack ); cf2_stack_clear( opStack );
@ -1729,7 +1729,7 @@
case cf2_cmdHVCURVETO: case cf2_cmdHVCURVETO:
{ {
CF2_UInt count, count1 = cf2_stack_count( opStack ); CF2_UInt count, count1 = cf2_stack_count( opStack );
CF2_UInt index = 0; CF2_UInt idx = 0;
FT_Bool alternate = FT_BOOL( op1 == cf2_cmdHVCURVETO ); FT_Bool alternate = FT_BOOL( op1 == cf2_cmdHVCURVETO );
@ -1738,29 +1738,29 @@
/* 8n+4, or 8n+5, we enforce it by clearing the */ /* 8n+4, or 8n+5, we enforce it by clearing the */
/* second bit */ /* second bit */
/* (and sorting the stack indexing to suit) */ /* (and sorting the stack indexing to suit) */
count = count1 & ~2U; count = count1 & ~2U;
index += count1 - count; idx += count1 - count;
FT_TRACE4(( alternate ? " hvcurveto\n" : " vhcurveto\n" )); FT_TRACE4(( alternate ? " hvcurveto\n" : " vhcurveto\n" ));
while ( index < count ) while ( idx < count )
{ {
CF2_Fixed x1, x2, x3, y1, y2, y3; CF2_Fixed x1, x2, x3, y1, y2, y3;
if ( alternate ) if ( alternate )
{ {
x1 = cf2_stack_getReal( opStack, index + 0 ) + curX; x1 = cf2_stack_getReal( opStack, idx + 0 ) + curX;
y1 = curY; y1 = curY;
x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; x2 = cf2_stack_getReal( opStack, idx + 1 ) + x1;
y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; y2 = cf2_stack_getReal( opStack, idx + 2 ) + y1;
y3 = cf2_stack_getReal( opStack, index + 3 ) + y2; y3 = cf2_stack_getReal( opStack, idx + 3 ) + y2;
if ( count - index == 5 ) if ( count - idx == 5 )
{ {
x3 = cf2_stack_getReal( opStack, index + 4 ) + x2; x3 = cf2_stack_getReal( opStack, idx + 4 ) + x2;
index++; idx++;
} }
else else
x3 = x2; x3 = x2;
@ -1770,16 +1770,16 @@
else else
{ {
x1 = curX; x1 = curX;
y1 = cf2_stack_getReal( opStack, index + 0 ) + curY; y1 = cf2_stack_getReal( opStack, idx + 0 ) + curY;
x2 = cf2_stack_getReal( opStack, index + 1 ) + x1; x2 = cf2_stack_getReal( opStack, idx + 1 ) + x1;
y2 = cf2_stack_getReal( opStack, index + 2 ) + y1; y2 = cf2_stack_getReal( opStack, idx + 2 ) + y1;
x3 = cf2_stack_getReal( opStack, index + 3 ) + x2; x3 = cf2_stack_getReal( opStack, idx + 3 ) + x2;
if ( count - index == 5 ) if ( count - idx == 5 )
{ {
y3 = cf2_stack_getReal( opStack, index + 4 ) + y2; y3 = cf2_stack_getReal( opStack, idx + 4 ) + y2;
index++; idx++;
} }
else else
y3 = y2; y3 = y2;
@ -1789,9 +1789,9 @@
cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 ); cf2_glyphpath_curveTo( &glyphPath, x1, y1, x2, y2, x3, y3 );
curX = x3; curX = x3;
curY = y3; curY = y3;
index += 4; idx += 4;
} }
cf2_stack_clear( opStack ); cf2_stack_clear( opStack );