Commit 77fb4cedff9a97f8d5538463092dba8d623c69e8
2000-11-04T09:41:45
removed redundant checks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c
index 7fceb21..f26901d 100644
--- a/src/base/ftbbox.c
+++ b/src/base/ftbbox.c
@@ -159,8 +159,10 @@
FT_Vector* to,
TBBox_Rec* user )
{
- if ( CHECK_X( control, user->bbox ) ||
- CHECK_X( to, user->bbox ) )
+ /* we don't need to check `to' since it is always an `on' point, thus */
+ /* within the bbox */
+
+ if ( CHECK_X( control, user->bbox ) )
BBox_Conic_Check( user->last.x,
control->x,
@@ -168,8 +170,7 @@
&user->bbox.xMin,
&user->bbox.xMax );
- if ( CHECK_Y( control, user->bbox ) ||
- CHECK_Y( to, user->bbox ) )
+ if ( CHECK_Y( control, user->bbox ) )
BBox_Conic_Check( user->last.y,
control->y,
@@ -305,9 +306,11 @@
FT_Vector* to,
TBBox_Rec* user )
{
+ /* we don't need to check `to' since it is always an `on' point, thus */
+ /* within the bbox */
+
if ( CHECK_X( control1, user->bbox ) ||
- CHECK_X( control2, user->bbox ) ||
- CHECK_X( to, user->bbox ) )
+ CHECK_X( control2, user->bbox ) )
BBox_Cubic_Check( user->last.x,
control1->x,
@@ -317,8 +320,7 @@
&user->bbox.xMax );
if ( CHECK_Y( control1, user->bbox ) ||
- CHECK_Y( control2, user->bbox ) ||
- CHECK_Y( to, user->bbox ) )
+ CHECK_Y( control2, user->bbox ) )
BBox_Cubic_Check( user->last.y,
control1->y,