Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

3 files changed, 215 insertions, 160 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index e281729..6a708b4 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -158,8 +158,8 @@ QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyph
     , m_height(0)
 {
     glGenFramebuffers(1, &m_fbo);
-    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)),
-            SLOT(contextDestroyed(const QGLContext *)));
+    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
+            SLOT(contextDestroyed(const QGLContext*)));
 }
 
 QGLTextureGlyphCache::~QGLTextureGlyphCache()
@@ -1454,7 +1454,8 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
         drawCached = false;
 
     // don't try to cache huge fonts
-    if (ti.fontEngine->fontDef.pixelSize * qSqrt(s->matrix.determinant()) >= 64)
+    const qreal pixelSize = ti.fontEngine->fontDef.pixelSize;
+    if (pixelSize * pixelSize * qAbs(s->matrix.determinant()) >= 64 * 64)
         drawCached = false;
 
     QFontEngineGlyphCache::Type glyphType = ti.fontEngine->glyphFormat >= 0
@@ -1775,13 +1776,10 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     d->glyphCacheType = QFontEngineGlyphCache::Raster_A8;
 
 #if !defined(QT_OPENGL_ES_2)
-    if (!d->device->format().alpha()
 #if defined(Q_WS_WIN)
-        && qt_cleartype_enabled
+    if (qt_cleartype_enabled)
 #endif
-       ) {
         d->glyphCacheType = QFontEngineGlyphCache::Raster_RGBMask;
-    }
 #endif
 
 #if defined(QT_OPENGL_ES_2)
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
index 1478b09..6082f49 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
@@ -209,6 +209,65 @@ void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen)
     }
 }
 
+void QTriangulatingStroker::moveTo(const qreal *pts)
+{
+    m_cx = pts[0];
+    m_cy = pts[1];
+
+    float x2 = pts[2];
+    float y2 = pts[3];
+    normalVector(m_cx, m_cy, x2, y2, &m_nvx, &m_nvy);
+
+
+    // To acheive jumps we insert zero-area tringles. This is done by
+    // adding two identical points in both the end of previous strip
+    // and beginning of next strip
+    bool invisibleJump = m_vertices.size();
+
+    switch (m_cap_style) {
+    case Qt::FlatCap:
+        if (invisibleJump) {
+            m_vertices.add(m_cx + m_nvx);
+            m_vertices.add(m_cy + m_nvy);
+        }
+        break;
+    case Qt::SquareCap: {
+        float sx = m_cx - m_nvy;
+        float sy = m_cy + m_nvx;
+        if (invisibleJump) {
+            m_vertices.add(sx + m_nvx);
+            m_vertices.add(sy + m_nvy);
+        }
+        emitLineSegment(sx, sy, m_nvx, m_nvy);
+        break; }
+    case Qt::RoundCap: {
+        QVarLengthArray<float> points;
+        arcPoints(m_cx, m_cy, m_cx + m_nvx, m_cy + m_nvy, m_cx - m_nvx, m_cy - m_nvy, points);
+        m_vertices.resize(m_vertices.size() + points.size() + 2 * int(invisibleJump));
+        int count = m_vertices.size();
+        int front = 0;
+        int end = points.size() / 2;
+        while (front != end) {
+            m_vertices.at(--count) = points[2 * end - 1];
+            m_vertices.at(--count) = points[2 * end - 2];
+            --end;
+            if (front == end)
+                break;
+            m_vertices.at(--count) = points[2 * front + 1];
+            m_vertices.at(--count) = points[2 * front + 0];
+            ++front;
+        }
+
+        if (invisibleJump) {
+            m_vertices.at(count - 1) = m_vertices.at(count + 1);
+            m_vertices.at(count - 2) = m_vertices.at(count + 0);
+        }
+        break; }
+    default: break; // ssssh gcc...
+    }
+    emitLineSegment(m_cx, m_cy, m_nvx, m_nvy);
+}
+
 void QTriangulatingStroker::cubicTo(const qreal *pts)
 {
     const QPointF *p = (const QPointF *) pts;
@@ -246,6 +305,152 @@ void QTriangulatingStroker::cubicTo(const qreal *pts)
     m_nvy = vy;
 }
 
+void QTriangulatingStroker::join(const qreal *pts)
+{
+    // Creates a join to the next segment (m_cx, m_cy) -> (pts[0], pts[1])
+    normalVector(m_cx, m_cy, pts[0], pts[1], &m_nvx, &m_nvy);
+
+    switch (m_join_style) {
+    case Qt::BevelJoin:
+        break;
+    case Qt::SvgMiterJoin:
+    case Qt::MiterJoin: {
+        // Find out on which side the join should be.
+        int count = m_vertices.size();
+        float prevNvx = m_vertices.at(count - 2) - m_cx;
+        float prevNvy = m_vertices.at(count - 1) - m_cy;
+        float xprod = prevNvx * m_nvy - prevNvy * m_nvx;
+        float px, py, qx, qy;
+
+        // If the segments are parallel, use bevel join.
+        if (qFuzzyIsNull(xprod))
+            break;
+
+        // Find the corners of the previous and next segment to join.
+        if (xprod < 0) {
+            px = m_vertices.at(count - 2);
+            py = m_vertices.at(count - 1);
+            qx = m_cx - m_nvx;
+            qy = m_cy - m_nvy;
+        } else {
+            px = m_vertices.at(count - 4);
+            py = m_vertices.at(count - 3);
+            qx = m_cx + m_nvx;
+            qy = m_cy + m_nvy;
+        }
+
+        // Find intersection point.
+        float pu = px * prevNvx + py * prevNvy;
+        float qv = qx * m_nvx + qy * m_nvy;
+        float ix = (m_nvy * pu - prevNvy * qv) / xprod;
+        float iy = (prevNvx * qv - m_nvx * pu) / xprod;
+
+        // Check that the distance to the intersection point is less than the miter limit.
+        if ((ix - px) * (ix - px) + (iy - py) * (iy - py) <= m_miter_limit * m_miter_limit) {
+            m_vertices.add(ix);
+            m_vertices.add(iy);
+            m_vertices.add(ix);
+            m_vertices.add(iy);
+        }
+        // else
+        // Do a plain bevel join if the miter limit is exceeded or if
+        // the lines are parallel. This is not what the raster
+        // engine's stroker does, but it is both faster and similar to
+        // what some other graphics API's do.
+
+        break; }
+    case Qt::RoundJoin: {
+        QVarLengthArray<float> points;
+        int count = m_vertices.size();
+        float prevNvx = m_vertices.at(count - 2) - m_cx;
+        float prevNvy = m_vertices.at(count - 1) - m_cy;
+        if (m_nvx * prevNvy - m_nvy * prevNvx < 0) {
+            arcPoints(0, 0, m_nvx, m_nvy, -prevNvx, -prevNvy, points);
+            for (int i = points.size() / 2; i > 0; --i)
+                emitLineSegment(m_cx, m_cy, points[2 * i - 2], points[2 * i - 1]);
+        } else {
+            arcPoints(0, 0, -prevNvx, -prevNvy, m_nvx, m_nvy, points);
+            for (int i = 0; i < points.size() / 2; ++i)
+                emitLineSegment(m_cx, m_cy, points[2 * i + 0], points[2 * i + 1]);
+        }
+        break; }
+    default: break; // gcc warn--
+    }
+
+    emitLineSegment(m_cx, m_cy, m_nvx, m_nvy);
+}
+
+void QTriangulatingStroker::endCap(const qreal *)
+{
+    switch (m_cap_style) {
+    case Qt::FlatCap:
+        break;
+    case Qt::SquareCap:
+        emitLineSegment(m_cx + m_nvy, m_cy - m_nvx, m_nvx, m_nvy);
+        break;
+    case Qt::RoundCap: {
+        QVarLengthArray<float> points;
+        int count = m_vertices.size();
+        arcPoints(m_cx, m_cy, m_vertices.at(count - 2), m_vertices.at(count - 1), m_vertices.at(count - 4), m_vertices.at(count - 3), points);
+        int front = 0;
+        int end = points.size() / 2;
+        while (front != end) {
+            m_vertices.add(points[2 * end - 2]);
+            m_vertices.add(points[2 * end - 1]);
+            --end;
+            if (front == end)
+                break;
+            m_vertices.add(points[2 * front + 0]);
+            m_vertices.add(points[2 * front + 1]);
+            ++front;
+        }
+        break; }
+    default: break; // to shut gcc up...
+    }
+}
+
+void QTriangulatingStroker::arcPoints(float cx, float cy, float fromX, float fromY, float toX, float toY, QVarLengthArray<float> &points)
+{
+    float dx1 = fromX - cx;
+    float dy1 = fromY - cy;
+    float dx2 = toX - cx;
+    float dy2 = toY - cy;
+
+    // while more than 180 degrees left:
+    while (dx1 * dy2 - dx2 * dy1 < 0) {
+        float tmpx = dx1 * m_cos_theta - dy1 * m_sin_theta;
+        float tmpy = dx1 * m_sin_theta + dy1 * m_cos_theta;
+        dx1 = tmpx;
+        dy1 = tmpy;
+        points.append(cx + dx1);
+        points.append(cy + dy1);
+    }
+
+    // while more than 90 degrees left:
+    while (dx1 * dx2 + dy1 * dy2 < 0) {
+        float tmpx = dx1 * m_cos_theta - dy1 * m_sin_theta;
+        float tmpy = dx1 * m_sin_theta + dy1 * m_cos_theta;
+        dx1 = tmpx;
+        dy1 = tmpy;
+        points.append(cx + dx1);
+        points.append(cy + dy1);
+    }
+
+    // while more than 0 degrees left:
+    while (dx1 * dy2 - dx2 * dy1 > 0) {
+        float tmpx = dx1 * m_cos_theta - dy1 * m_sin_theta;
+        float tmpy = dx1 * m_sin_theta + dy1 * m_cos_theta;
+        dx1 = tmpx;
+        dy1 = tmpy;
+        points.append(cx + dx1);
+        points.append(cy + dy1);
+    }
+
+    // remove last point which was rotated beyond [toX, toY].
+    if (!points.isEmpty())
+        points.resize(points.size() - 2);
+}
+
 static void qdashprocessor_moveTo(qreal x, qreal y, void *data)
 {
     ((QDashedStrokeProcessor *) data)->addElement(QPainterPath::MoveToElement, x, y);
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
index a0117d5..2dba0ce 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
@@ -43,6 +43,7 @@
 #define QTRIANGULATINGSTROKER_P_H
 
 #include <private/qdatabuffer_p.h>
+#include <qvarlengtharray.h>
 #include <private/qvectorpath_p.h>
 #include <private/qbezier_p.h>
 #include <private/qnumeric_p.h>
@@ -62,13 +63,13 @@ public:
 
 private:
     inline void emitLineSegment(float x, float y, float nx, float ny);
-    inline void moveTo(const qreal *pts);
+    void moveTo(const qreal *pts);
     inline void lineTo(const qreal *pts);
     void cubicTo(const qreal *pts);
-    inline void join(const qreal *pts);
+    void join(const qreal *pts);
     inline void normalVector(float x1, float y1, float x2, float y2, float *nx, float *ny);
-    inline void endCap(const qreal *pts);
-    inline void arc(float x, float y);
+    void endCap(const qreal *pts);
+    void arcPoints(float cx, float cy, float fromX, float fromY, float toX, float toY, QVarLengthArray<float> &points);
     void endCapOrJoinClosed(const qreal *start, const qreal *cur, bool implicitClose, bool endsAtStart);
 
 
@@ -116,10 +117,6 @@ private:
     qreal m_inv_scale;
 };
 
-
-
-
-
 inline void QTriangulatingStroker::normalVector(float x1, float y1, float x2, float y2,
                                                 float *nx, float *ny)
 {
@@ -139,8 +136,6 @@ inline void QTriangulatingStroker::normalVector(float x1, float y1, float x2, fl
     *ny = dx * pw;
 }
 
-
-
 inline void QTriangulatingStroker::emitLineSegment(float x, float y, float vx, float vy)
 {
     m_vertices.add(x + vx);
@@ -149,103 +144,6 @@ inline void QTriangulatingStroker::emitLineSegment(float x, float y, float vx, f
     m_vertices.add(y - vy);
 }
 
-
-
-// We draw a full circle for any round join or round cap which is a
-// bit of overkill...
-inline void QTriangulatingStroker::arc(float x, float y)
-{
-    float dx = m_width;
-    float dy = 0;
-    for (int i=0; i<=m_roundness; ++i) {
-        float tmpx = dx * m_cos_theta - dy * m_sin_theta;
-        float tmpy = dx * m_sin_theta + dy * m_cos_theta;
-        dx = tmpx;
-        dy = tmpy;
-        emitLineSegment(x, y, dx, dy);
-    }
-}
-
-
-
-inline void QTriangulatingStroker::endCap(const qreal *pts)
-{
-    switch (m_cap_style) {
-    case Qt::FlatCap:
-        break;
-    case Qt::SquareCap: {
-        float dx = m_cx - *(pts - 2);
-        float dy = m_cy - *(pts - 1);
-
-        float len = m_width / sqrt(dx * dx + dy * dy);
-        dx = dx * len;
-        dy = dy * len;
-
-        emitLineSegment(m_cx + dx, m_cy + dy, m_nvx, m_nvy);
-        break; }
-    case Qt::RoundCap:
-        arc(m_cx, m_cy);
-        break;
-    default: break; // to shut gcc up...
-    }
-}
-
-
-void QTriangulatingStroker::moveTo(const qreal *pts)
-{
-    m_cx = pts[0];
-    m_cy = pts[1];
-
-    float x2 = pts[2];
-    float y2 = pts[3];
-    normalVector(m_cx, m_cy, x2, y2, &m_nvx, &m_nvy);
-
-
-    // To acheive jumps we insert zero-area tringles. This is done by
-    // adding two identical points in both the end of previous strip
-    // and beginning of next strip
-    bool invisibleJump = m_vertices.size();
-
-    switch (m_cap_style) {
-    case Qt::FlatCap:
-        if (invisibleJump) {
-            m_vertices.add(m_cx + m_nvx);
-            m_vertices.add(m_cy + m_nvy);
-        }
-        break;
-    case Qt::SquareCap: {
-        float dx = x2 - m_cx;
-        float dy = y2 - m_cy;
-        float len = m_width / sqrt(dx * dx + dy * dy);
-        dx = dx * len;
-        dy = dy * len;
-        float sx = m_cx - dx;
-        float sy = m_cy - dy;
-        if (invisibleJump) {
-            m_vertices.add(sx + m_nvx);
-            m_vertices.add(sy + m_nvy);
-        }
-        emitLineSegment(sx, sy, m_nvx, m_nvy);
-        break; }
-    case Qt::RoundCap:
-        if (invisibleJump) {
-            m_vertices.add(m_cx + m_nvx);
-            m_vertices.add(m_cy + m_nvy);
-        }
-
-        // This emitLineSegment is not needed for the arc, but we need
-        // to start where we put the invisibleJump vertex, otherwise
-        // we'll have visible triangles between subpaths.
-        emitLineSegment(m_cx, m_cy, m_nvx, m_nvy);
-        arc(m_cx, m_cy);
-        break;
-    default: break; // ssssh gcc...
-    }
-    emitLineSegment(m_cx, m_cy, m_nvx, m_nvy);
-}
-
-
-
 void QTriangulatingStroker::lineTo(const qreal *pts)
 {
     emitLineSegment(pts[0], pts[1], m_nvx, m_nvy);
@@ -253,52 +151,6 @@ void QTriangulatingStroker::lineTo(const qreal *pts)
     m_cy = pts[1];
 }
 
-
-
-void QTriangulatingStroker::join(const qreal *pts)
-{
-    // Creates a join to the next segment (m_cx, m_cy) -> (pts[0], pts[1])
-    normalVector(m_cx, m_cy, pts[0], pts[1], &m_nvx, &m_nvy);
-
-    switch (m_join_style) {
-    case Qt::BevelJoin:
-        break;
-    case Qt::MiterJoin: {
-        int p1 = m_vertices.size() - 6;
-        int p2 = m_vertices.size() - 2;
-        QLineF line(m_vertices.at(p1), m_vertices.at(p1+1),
-                    m_vertices.at(p2), m_vertices.at(p2+1));
-        QLineF nextLine(m_cx - m_nvx, m_cy - m_nvy,
-                        pts[0] - m_nvx, pts[1] - m_nvy);
-
-        QPointF isect;
-        if (line.intersect(nextLine, &isect) != QLineF::NoIntersection
-            && QLineF(line.p2(), isect).length() <= m_miter_limit) {
-            // The intersection point mirrored over the m_cx, m_cy point
-            m_vertices.add(m_cx - (isect.x() - m_cx));
-            m_vertices.add(m_cy - (isect.y() - m_cy));
-
-            // The intersection point
-            m_vertices.add(isect.x());
-            m_vertices.add(isect.y());
-        }
-        // else
-        // Do a plain bevel join if the miter limit is exceeded or if
-        // the lines are parallel. This is not what the raster
-        // engine's stroker does, but it is both faster and similar to
-        // what some other graphics API's do.
-
-        break; }
-    case Qt::RoundJoin:
-        arc(m_cx, m_cy);
-        break;
-
-    default: break; // gcc warn--
-    }
-
-    emitLineSegment(m_cx, m_cy, m_nvx, m_nvy);
-}
-
 QT_END_NAMESPACE
 
 #endif