Changeset 846 for trunk/src/gui/painting/qbezier_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qbezier_p.h (modified) (5 diffs)

trunk/src/gui/painting/qbezier_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -60 +60 @@
 #include "QtCore/qlist.h"
 #include "QtCore/qpair.h"
+#include "QtGui/qtransform.h"
 
 QT_BEGIN_NAMESPACE
@@ -79 +80 @@
     inline QPointF secondDerivedAt(qreal t) const;
 
-    QPolygonF toPolygon() const;
-    void addToPolygon(QPolygonF *p) const;
-    void addToPolygonIterative(QPolygonF *p) const;
-    void addToPolygonMixed(QPolygonF *p) const;
+    QPolygonF toPolygon(qreal bezier_flattening_threshold = 0.5) const;
+    void addToPolygon(QPolygonF *p, qreal bezier_flattening_threshold = 0.5) const;
+
     QRectF bounds() const;
     qreal length(qreal error = 0.01) const;
@@ -97 +97 @@
     QPointF pt4() const { return QPointF(x4, y4); }
 
+    QBezier mapBy(const QTransform &transform) const;
+
     inline QPointF midPoint() const;
     inline QLineF midTangent() const;
@@ -105 +107 @@
     inline void parameterSplitLeft(qreal t, QBezier *left);
     inline void split(QBezier *firstHalf, QBezier *secondHalf) const;
+
     int shifted(QBezier *curveSegments, int maxSegmets,
                 qreal offset, float threshold) const;
 
-    QVector< QList<QBezier> > splitAtIntersections(QBezier &a);
-
     QBezier bezierOnInterval(qreal t0, qreal t1) const;
-
-    static QVector< QPair<qreal, qreal> > findIntersections(const QBezier &a,
-                                                     const QBezier &b);
-
-    static bool findIntersections(const QBezier &a, const QBezier &b,
-                                  QVector<QPair<qreal, qreal> > *t);
+    QBezier getSubRange(qreal t0, qreal t1) const;
 
     qreal x1, y1, x2, y2, x3, y3, x4, y4;