Remove redundant code; fix computation of `last'.

This commit is contained in:
Werner Lemberg 2000-11-03 07:34:29 +00:00
parent cf6bc2e22d
commit 350a1c1a9e
1 changed files with 7 additions and 8 deletions

View File

@ -45,7 +45,8 @@
/* <Description> */ /* <Description> */
/* This function is used as a `move_to' and `line_to' emitter during */ /* This function is used as a `move_to' and `line_to' emitter during */
/* FT_Outline_Decompose(). It simply records the destination point */ /* FT_Outline_Decompose(). It simply records the destination point */
/* in `user->last'. */ /* in `user->last'; no further computations are necessary since we */
/* the cbox as the starting bbox which must be refined. */
/* */ /* */
/* <Input> */ /* <Input> */
/* to :: A pointer to the destination vector. */ /* to :: A pointer to the destination vector. */
@ -99,13 +100,10 @@
FT_Pos* min, FT_Pos* min,
FT_Pos* max ) FT_Pos* max )
{ {
if( y1 == y3 ) if ( y1 == y3 )
{ {
if ( y2 == y1 ) /* Flat arc */ if ( y2 == y1 ) /* Flat arc */
{
y3 = y1;
goto Suite; goto Suite;
}
} }
else if ( y1 < y3 ) else if ( y1 < y3 )
{ {
@ -179,6 +177,8 @@
&user->bbox.yMin, &user->bbox.yMin,
&user->bbox.yMax ); &user->bbox.yMax );
user->last = *to;
return 0; return 0;
} }
@ -232,10 +232,7 @@
if ( y1 == y4 ) if ( y1 == y4 )
{ {
if ( y1 == y2 && y1 == y3 ) /* Flat */ if ( y1 == y2 && y1 == y3 ) /* Flat */
{
y4 = y1;
goto Test; goto Test;
}
} }
else if ( y1 < y4 ) else if ( y1 < y4 )
{ {
@ -330,6 +327,8 @@
&user->bbox.yMin, &user->bbox.yMin,
&user->bbox.yMax ); &user->bbox.yMax );
user->last = *to;
return 0; return 0;
} }