Changeset 561 for trunk/src/gui/painting/qpathclipper.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qpathclipper.cpp (modified) (27 diffs)

trunk/src/gui/painting/qpathclipper.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include <private/qdatabuffer_p.h>
 #include <qmath.h>
-
-#include <QImage>
-#include <QPainter>
 
 /**
@@ -69 +66 @@
 QT_BEGIN_NAMESPACE
 
+static inline bool fuzzyIsNull(qreal d)
+{
+    if (sizeof(qreal) == sizeof(double))
+        return qAbs(d) <= 1e-12;
+    else
+        return qAbs(d) <= 1e-5f;
+}
+
+static inline bool comparePoints(const QPointF &a, const QPointF &b)
+{
+    return fuzzyIsNull(a.x() - b.x())
+           && fuzzyIsNull(a.y() - b.y());
+}
+
 //#define QDEBUG_CLIPPER
 static qreal dot(const QPointF &a, const QPointF &b)
@@ -106 +117 @@
 bool QIntersectionFinder::beziersIntersect(const QBezier &one, const QBezier &two) const
 {
-    return (one.pt1() == two.pt1() && one.pt2() == two.pt2() && one.pt3() == two.pt3() && one.pt4() == two.pt4())
-           || (one.pt1() == two.pt4() && one.pt2() == two.pt3() && one.pt3() == two.pt2() && one.pt4() == two.pt1())
+    return (comparePoints(one.pt1(), two.pt1()) && comparePoints(one.pt2(), two.pt2())
+            && comparePoints(one.pt3(), two.pt3()) && comparePoints(one.pt4(), two.pt4()))
+           || (comparePoints(one.pt1(), two.pt4()) && comparePoints(one.pt2(), two.pt3())
+               && comparePoints(one.pt3(), two.pt2()) && comparePoints(one.pt4(), two.pt1()))
            || QBezier::findIntersections(one, two, 0);
 }
@@ -119 +132 @@
     const QPointF q2 = b.p2();
 
-    if (p1 == p2 || q1 == q2)
+    if (comparePoints(p1, p2) || comparePoints(q1, q2))
         return false;
 
-    const bool p1_equals_q1 = (p1 == q1);
-    const bool p2_equals_q2 = (p2 == q2);
+    const bool p1_equals_q1 = comparePoints(p1, q1);
+    const bool p2_equals_q2 = comparePoints(p2, q2);
 
     if (p1_equals_q1 && p2_equals_q2)
         return true;
 
-    const bool p1_equals_q2 = (p1 == q2);
-    const bool p2_equals_q1 = (p2 == q1);
+    const bool p1_equals_q2 = comparePoints(p1, q2);
+    const bool p2_equals_q1 = comparePoints(p2, q1);
 
     if (p1_equals_q2 && p2_equals_q1)
@@ -139 +152 @@
     const qreal par = pDelta.x() * qDelta.y() - pDelta.y() * qDelta.x();
 
-    if (qFuzzyCompare(par + 1, 1)) {
+    if (qFuzzyIsNull(par)) {
         const QPointF normal(-pDelta.y(), pDelta.x());
 
         // coinciding?
-        if (qFuzzyCompare(dot(normal, q1 - p1) + 1, 1)) {
+        if (qFuzzyIsNull(dot(normal, q1 - p1))) {
             const qreal dp = dot(pDelta, pDelta);
 
@@ -185 +198 @@
 void QIntersectionFinder::intersectBeziers(const QBezier &one, const QBezier &two, QVector<QPair<qreal, qreal> > &t, QDataBuffer<QIntersection> &intersections)
 {
-    if ((one.pt1() == two.pt1() && one.pt2() == two.pt2() && one.pt3() == two.pt3() && one.pt4() == two.pt4())
-        || (one.pt1() == two.pt4() && one.pt2() == two.pt3() && one.pt3() == two.pt2() && one.pt4() == two.pt1())) {
+    if ((comparePoints(one.pt1(), two.pt1()) && comparePoints(one.pt2(), two.pt2())
+         && comparePoints(one.pt3(), two.pt3()) && comparePoints(one.pt4(), two.pt4()))
+        || (comparePoints(one.pt1(), two.pt4()) && comparePoints(one.pt2(), two.pt3())
+            && comparePoints(one.pt3(), two.pt2()) && comparePoints(one.pt4(), two.pt1()))) {
 
         return;
@@ -203 +218 @@
 
         QPointF pt;
-        if (qFuzzyCompare(alpha_p + 1, 1)) {
+        if (qFuzzyIsNull(alpha_p)) {
             pt = one.pt1();
-        } else if (qFuzzyCompare(alpha_p, 1)) {
+        } else if (qFuzzyIsNull(alpha_p - 1)) {
             pt = one.pt4();
-        } else if (qFuzzyCompare(alpha_q + 1, 1)) {
+        } else if (qFuzzyIsNull(alpha_q)) {
             pt = two.pt1();
-        } else if (qFuzzyCompare(alpha_q, 1)) {
+        } else if (qFuzzyIsNull(alpha_q - 1)) {
             pt = two.pt4();
         } else {
@@ -231 +246 @@
     const QPointF q2 = b.p2();
 
-    if (p1 == p2 || q1 == q2)
+    if (comparePoints(p1, p2) || comparePoints(q1, q2))
         return;
 
-    const bool p1_equals_q1 = (p1 == q1);
-    const bool p2_equals_q2 = (p2 == q2);
+    const bool p1_equals_q1 = comparePoints(p1, q1);
+    const bool p2_equals_q2 = comparePoints(p2, q2);
 
     if (p1_equals_q1 && p2_equals_q2)
         return;
 
-    const bool p1_equals_q2 = (p1 == q2);
-    const bool p2_equals_q1 = (p2 == q1);
+    const bool p1_equals_q2 = comparePoints(p1, q2);
+    const bool p2_equals_q1 = comparePoints(p2, q1);
 
     if (p1_equals_q2 && p2_equals_q1)
@@ -251 +266 @@
     const qreal par = pDelta.x() * qDelta.y() - pDelta.y() * qDelta.x();
 
-    if (qFuzzyCompare(par + 1, 1)) {
+    if (qFuzzyIsNull(par)) {
         const QPointF normal(-pDelta.y(), pDelta.x());
 
         // coinciding?
-        if (qFuzzyCompare(dot(normal, q1 - p1) + 1, 1)) {
+        if (qFuzzyIsNull(dot(normal, q1 - p1))) {
             const qreal invDp = 1 / dot(pDelta, pDelta);
 
@@ -316 +331 @@
         return;
 
-    const bool p_zero = qFuzzyCompare(tp + 1, 1);
-    const bool p_one = qFuzzyCompare(tp, 1);
-
-    const bool q_zero = qFuzzyCompare(tq + 1, 1);
-    const bool q_one = qFuzzyCompare(tq, 1);
+    const bool p_zero = qFuzzyIsNull(tp);
+    const bool p_one = qFuzzyIsNull(tp - 1);
+
+    const bool q_zero = qFuzzyIsNull(tq);
+    const bool q_one = qFuzzyIsNull(tq - 1);
 
     if ((q_zero || q_one) && (p_zero || p_one))
@@ -625 +640 @@
         const qreal value = pointComponents[depth & 1];
 
-        if (qFuzzyCompare(pivot, value)) {
+        if (fuzzyIsNull(pivot - value)) {
             const qreal pivot2 = pivotComponents[(depth + 1) & 1];
             const qreal value2 = pointComponents[(depth + 1) & 1];
 
-            if (qFuzzyCompare(pivot2, value2)) {
+            if (fuzzyIsNull(pivot2 - value2)) {
                 if (node.id < 0)
                     node.id = m_tree->nextId();
@@ -803 +818 @@
 static bool isLine(const QBezier &bezier)
 {
-    const bool equal_1_2 = bezier.pt1() == bezier.pt2();
-    const bool equal_2_3 = bezier.pt2() == bezier.pt3();
-    const bool equal_3_4 = bezier.pt3() == bezier.pt4();
+    const bool equal_1_2 = comparePoints(bezier.pt1(), bezier.pt2());
+    const bool equal_2_3 = comparePoints(bezier.pt2(), bezier.pt3());
+    const bool equal_3_4 = comparePoints(bezier.pt3(), bezier.pt4());
 
     // point?
@@ -811 +826 @@
         return true;
 
-    if (bezier.pt1() == bezier.pt4())
+    if (comparePoints(bezier.pt1(), bezier.pt4()))
         return equal_1_2 || equal_3_4;
 
@@ -845 +860 @@
             currentPoint = path.elementAt(i);
 
-        if (i > 0 && m_points.at(lastMoveTo) == currentPoint)
+        if (i > 0 && comparePoints(m_points.at(lastMoveTo), currentPoint))
             current = lastMoveTo;
         else
@@ -852 +867 @@
         switch (path.elementAt(i).type) {
         case QPainterPath::MoveToElement:
-            if (hasMoveTo && last != lastMoveTo && m_points.at(last) != m_points.at(lastMoveTo))
+            if (hasMoveTo && last != lastMoveTo && !comparePoints(m_points.at(last), m_points.at(lastMoveTo)))
                 m_segments << Segment(m_pathId, last, lastMoveTo);
             hasMoveTo = true;
@@ -880 +895 @@
     }
 
-    if (hasMoveTo && last != lastMoveTo && m_points.at(last) != m_points.at(lastMoveTo))
+    if (hasMoveTo && last != lastMoveTo && !comparePoints(m_points.at(last), m_points.at(lastMoveTo)))
         m_segments << Segment(m_pathId, last, lastMoveTo);
 
@@ -923 +938 @@
     qreal result = b_angle - a_angle;
 
-    if (qFuzzyCompare(result + 1, 1) || qFuzzyCompare(result, 128))
+    if (qFuzzyIsNull(result) || qFuzzyCompare(result, 128))
         return 0;
 
@@ -952 +967 @@
         normal = ep->bezier->derivedAt(t);
 
-        if (qFuzzyCompare(normal.x() + 1, 1) && qFuzzyCompare(normal.y() + 1, 1))
+        if (qFuzzyIsNull(normal.x()) && qFuzzyIsNull(normal.y()))
             normal = ep->bezier->secondDerivedAt(t);
     } else {
@@ -1081 +1096 @@
 #endif
 
-        if (!(qFuzzyCompare(d2 + 1, 1) && isLeftOf(*this, vi, status.edge, ei))
+        if (!(qFuzzyIsNull(d2) && isLeftOf(*this, vi, status.edge, ei))
             && (d2 < d || (qFuzzyCompare(d2, d) && isLeftOf(*this, vi, status.edge, position)))) {
             position = status.edge;
@@ -1195 +1210 @@
 #else
     // doesn't seem to be robust enough
-    return atan2(v.x(), v.y()) + Q_PI;
+    return qAtan2(v.x(), v.y()) + Q_PI;
 #endif
 }
@@ -1233 +1248 @@
         QPointF bTangent = -bezier->derivedAt(t1);
 
-        if (qFuzzyCompare(aTangent.x() + 1, 1) && qFuzzyCompare(aTangent.y() + 1, 1))
+        if (qFuzzyIsNull(aTangent.x()) && qFuzzyIsNull(aTangent.y()))
             aTangent = bezier->secondDerivedAt(t0);
 
-        if (qFuzzyCompare(bTangent.x() + 1, 1) && qFuzzyCompare(bTangent.y() + 1, 1))
+        if (qFuzzyIsNull(bTangent.x()) && qFuzzyIsNull(bTangent.y()))
             bTangent = bezier->secondDerivedAt(t1);
 
@@ -1358 +1373 @@
         return;
 
-    if (a == b) {
+    if (comparePoints(a, b)) {
         int v = insert(a);
 
@@ -1401 +1416 @@
             const QPointF p(-d1.y(), d1.x());
 
-            if (qFuzzyCompare(dot(p, d2) + 1, 1)) {
+            if (qFuzzyIsNull(dot(p, d2))) {
                 path.setElementPositionAt(elementCount - 1, point.x(), point.y());
                 return;
@@ -1636 +1651 @@
 InputIterator qFuzzyFind(InputIterator first, InputIterator last, qreal val)
 {
-    while (first != last && !qFuzzyCompare(qreal(*first), qreal(val)))
+    while (first != last && !QT_PREPEND_NAMESPACE(qFuzzyCompare)(qreal(*first), qreal(val)))
         ++first;
     return first;