Use qIsFuzzyNull rather than the more expensive qFuzzyCompare

See also fde7f3d03782c801901f511131458d6fcb1021a5

Reviewed-by: Olivier
Reviewed-by: Samuel

1 files changed, 18 insertions, 18 deletions

diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 297cdd3..33609ad 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -138,11 +138,11 @@ bool QIntersectionFinder::linesIntersect(const QLineF &a, const QLineF &b) const
 
     const qreal par = pDelta.x() * qDelta.y() - pDelta.y() * qDelta.x();
 
-    if (qFuzzyCompare(par + 1, 1)) {
+    if (qIsFuzzyNull(par)) {
         const QPointF normal(-pDelta.y(), pDelta.x());
 
         // coinciding?
-        if (qFuzzyCompare(dot(normal, q1 - p1) + 1, 1)) {
+        if (qIsFuzzyNull(dot(normal, q1 - p1))) {
             const qreal dp = dot(pDelta, pDelta);
 
             const qreal tq1 = dot(pDelta, q1 - p1);
@@ -202,13 +202,13 @@ void QIntersectionFinder::intersectBeziers(const QBezier &one, const QBezier &tw
         qreal alpha_q = t.at(i).second;
 
         QPointF pt;
-        if (qFuzzyCompare(alpha_p + 1, 1)) {
+        if (qIsFuzzyNull(alpha_p)) {
             pt = one.pt1();
-        } else if (qFuzzyCompare(alpha_p, 1)) {
+        } else if (qIsFuzzyNull(alpha_p - 1)) {
             pt = one.pt4();
-        } else if (qFuzzyCompare(alpha_q + 1, 1)) {
+        } else if (qIsFuzzyNull(alpha_q)) {
             pt = two.pt1();
-        } else if (qFuzzyCompare(alpha_q, 1)) {
+        } else if (qIsFuzzyNull(alpha_q - 1)) {
             pt = two.pt4();
         } else {
             pt = one.pointAt(alpha_p);
@@ -250,11 +250,11 @@ void QIntersectionFinder::intersectLines(const QLineF &a, const QLineF &b, QData
 
     const qreal par = pDelta.x() * qDelta.y() - pDelta.y() * qDelta.x();
 
-    if (qFuzzyCompare(par + 1, 1)) {
+    if (qIsFuzzyNull(par)) {
         const QPointF normal(-pDelta.y(), pDelta.x());
 
         // coinciding?
-        if (qFuzzyCompare(dot(normal, q1 - p1) + 1, 1)) {
+        if (qIsFuzzyNull(dot(normal, q1 - p1))) {
             const qreal invDp = 1 / dot(pDelta, pDelta);
 
             const qreal tq1 = dot(pDelta, q1 - p1) * invDp;
@@ -315,11 +315,11 @@ void QIntersectionFinder::intersectLines(const QLineF &a, const QLineF &b, QData
     if (tp<0 || tp>1 || tq<0 || tq>1)
         return;
 
-    const bool p_zero = qFuzzyCompare(tp + 1, 1);
-    const bool p_one = qFuzzyCompare(tp, 1);
+    const bool p_zero = qIsFuzzyNull(tp);
+    const bool p_one = qIsFuzzyNull(tp - 1);
 
-    const bool q_zero = qFuzzyCompare(tq + 1, 1);
-    const bool q_one = qFuzzyCompare(tq, 1);
+    const bool q_zero = qIsFuzzyNull(tq);
+    const bool q_one = qIsFuzzyNull(tq - 1);
 
     if ((q_zero || q_one) && (p_zero || p_one))
         return;
@@ -922,7 +922,7 @@ qreal QWingedEdge::delta(int vertex, int a, int b) const
 
     qreal result = b_angle - a_angle;
 
-    if (qFuzzyCompare(result + 1, 1) || qFuzzyCompare(result, 128))
+    if (qIsFuzzyNull(result) || qFuzzyCompare(result, 128))
         return 0;
 
     if (result < 0)
@@ -951,7 +951,7 @@ static inline QPointF tangentAt(const QWingedEdge &list, int vi, int ei)
     if (ep->bezier) {
         normal = ep->bezier->derivedAt(t);
 
-        if (qFuzzyCompare(normal.x() + 1, 1) && qFuzzyCompare(normal.y() + 1, 1))
+        if (qIsFuzzyNull(normal.x()) && qIsFuzzyNull(normal.y()))
             normal = ep->bezier->secondDerivedAt(t);
     } else {
         const QPointF a = *list.vertex(ep->first);
@@ -1080,7 +1080,7 @@ QWingedEdge::TraversalStatus QWingedEdge::findInsertStatus(int vi, int ei) const
         qDebug() << "Delta to edge" << status.edge << d2 << ", angles: " << op->angle << op->invAngle;
 #endif
 
-        if (!(qFuzzyCompare(d2 + 1, 1) && isLeftOf(*this, vi, status.edge, ei))
+        if (!(qIsFuzzyNull(d2) && isLeftOf(*this, vi, status.edge, ei))
             && (d2 < d || (qFuzzyCompare(d2, d) && isLeftOf(*this, vi, status.edge, position)))) {
             position = status.edge;
             d = d2;
@@ -1232,10 +1232,10 @@ int QWingedEdge::addEdge(int fi, int si, const QBezier *bezier, qreal t0, qreal
         QPointF aTangent = bezier->derivedAt(t0);
         QPointF bTangent = -bezier->derivedAt(t1);
 
-        if (qFuzzyCompare(aTangent.x() + 1, 1) && qFuzzyCompare(aTangent.y() + 1, 1))
+        if (qIsFuzzyNull(aTangent.x()) && qIsFuzzyNull(aTangent.y()))
             aTangent = bezier->secondDerivedAt(t0);
 
-        if (qFuzzyCompare(bTangent.x() + 1, 1) && qFuzzyCompare(bTangent.y() + 1, 1))
+        if (qIsFuzzyNull(bTangent.x()) && qIsFuzzyNull(bTangent.y()))
             bTangent = bezier->secondDerivedAt(t1);
 
         ep->angle = computeAngle(aTangent);
@@ -1400,7 +1400,7 @@ static void addLineTo(QPainterPath &path, const QPointF &point)
 
             const QPointF p(-d1.y(), d1.x());
 
-            if (qFuzzyCompare(dot(p, d2) + 1, 1)) {
+            if (qIsFuzzyNull(dot(p, d2))) {
                 path.setElementPositionAt(elementCount - 1, point.x(), point.y());
                 return;
             }