Remove FXSYS_Mul.

third_party/agg23/agg_curves.cpp

 
 //----------------------------------------------------------------------------
 // XYQ: 2006-01-22 Copied from AGG project.
 // TODO: This file uses intensive floating point operations, so it's NOT suitable
 // for platforms like Symbian OS. We need to change to FIX format.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
@@ skipping 43 matching lines @@
     FX_FLOAT x34   = (x3 + x4) / 2;
     FX_FLOAT y34   = (y3 + y4) / 2;
     FX_FLOAT x123  = (x12 + x23) / 2;
     FX_FLOAT y123  = (y12 + y23) / 2;
     FX_FLOAT x234  = (x23 + x34) / 2;
     FX_FLOAT y234  = (y23 + y34) / 2;
     FX_FLOAT x1234 = (x123 + x234) / 2;
     FX_FLOAT y1234 = (y123 + y234) / 2;
     FX_FLOAT dx = x4 - x1;
     FX_FLOAT dy = y4 - y1;
-    FX_FLOAT d2 = FXSYS_fabs(FXSYS_Mul(x2 - x4, dy) - FXSYS_Mul(y2 - y4, dx));
-    FX_FLOAT d3 = FXSYS_fabs(FXSYS_Mul(x3 - x4, dy) - FXSYS_Mul(y3 - y4, dx));
+    FX_FLOAT d2 = FXSYS_fabs(((x2 - x4) * dy) - ((y2 - y4) * dx));
+    FX_FLOAT d3 = FXSYS_fabs(((x3 - x4) * dy) - ((y3 - y4) * dx));
     switch((int(d2 > curve_collinearity_epsilon) << 1) +
             int(d3 > curve_collinearity_epsilon)) {
         case 0:
             if(FXSYS_fabs(x1 + x3 - x2 - x2) +
                     FXSYS_fabs(y1 + y3 - y2 - y2) +
                     FXSYS_fabs(x2 + x4 - x3 - x3) +
                     FXSYS_fabs(y2 + y4 - y3 - y3) <= m_distance_tolerance_manhattan) {
                 m_points.add(point_type(x1234, y1234, path_flags_jr));
                 return;
             }
             break;
         case 1:
-            if(FXSYS_Mul(d3, d3) <= FXSYS_Mul(m_distance_tolerance_square,
-                                              FXSYS_Mul(dx, dx) + FXSYS_Mul(dy, dy))) {
+          if ((d3 * d3) <=
+              (m_distance_tolerance_square * ((dx * dx) + (dy * dy)))) {
                 m_points.add(point_type(x23, y23, path_flags_jr));
                 return;
             }
             break;
         case 2:
-            if(FXSYS_Mul(d2, d2) <= FXSYS_Mul(m_distance_tolerance_square,
-                                              FXSYS_Mul(dx, dx) + FXSYS_Mul(dy, dy))) {
+          if ((d2 * d2) <=
+              (m_distance_tolerance_square * ((dx * dx) + (dy * dy)))) {
                 m_points.add(point_type(x23, y23, path_flags_jr));
                 return;
             }
             break;
         case 3:
-            if(FXSYS_Mul(d2 + d3, d2 + d3) <= FXSYS_Mul(m_distance_tolerance_square,
-                    FXSYS_Mul(dx, dx) + FXSYS_Mul(dy, dy))) {
+          if (((d2 + d3) * (d2 + d3)) <=
+              (m_distance_tolerance_square * ((dx * dx) + (dy * dy)))) {
                 m_points.add(point_type(x23, y23, path_flags_jr));
                 return;
             }
             break;
     }
     recursive_bezier(x1, y1, x12, y12, x123, y123, x1234, y1234, level + 1);
     recursive_bezier(x1234, y1234, x234, y234, x34, y34, x4, y4, level + 1);
 }
 void curve4_div::bezier(FX_FLOAT x1, FX_FLOAT y1,
                         FX_FLOAT x2, FX_FLOAT y2,
                         FX_FLOAT x3, FX_FLOAT y3,
                         FX_FLOAT x4, FX_FLOAT y4)
 {
     m_points.add(point_type(x1, y1));
     recursive_bezier(x1, y1, x2, y2, x3, y3, x4, y4, 0);
     m_points.add(point_type(x4, y4));
 }
 }