Changeset 561 for trunk/src/gui/painting/qoutlinemapper.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/qoutlinemapper.cpp (modified) (7 diffs)

trunk/src/gui/painting/qoutlinemapper.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$
 **
@@ -41 +41 @@
 
 #include "qoutlinemapper_p.h"
-
+#include <private/qpainterpath_p.h>
 #include "qmath.h"
 
@@ -199 +199 @@
             }
         } else {
-            // ## TODO: this case needs to be plain code polygonal paths
-            QPainterPath path;
-            if (m_element_types.isEmpty()) {
-                if (!m_elements.isEmpty())
-                    path.moveTo(m_elements.at(0));
-                for (int i=1; i<m_elements.size(); ++i)
-                    path.lineTo(m_elements.at(i));
-            } else {
-                for (int i=0; i<m_elements.size(); ++i) {
-                    switch (m_element_types.at(i)) {
-                    case QPainterPath::MoveToElement:
-                        path.moveTo(m_elements.at(i));
-                        break;
-                    case QPainterPath::LineToElement:
-                        path.lineTo(m_elements.at(i));
-                        break;
-                    case QPainterPath::CurveToElement:
-                        path.cubicTo(m_elements.at(i), m_elements.at(i+1), m_elements.at(i+2));
-                        i += 2;
-                        break;
-                    default:
-                        Q_ASSERT(false);
-                        break;
-                    }
-                }
-            }
+            const QVectorPath vp((qreal *)m_elements.data(), m_elements.size(), m_element_types.size() ? m_element_types.data() : 0);
+            QPainterPath path = vp.convertToPainterPath();
             path = QTransform(m_m11, m_m12, m_m13, m_m21, m_m22, m_m23, m_dx, m_dy, m_m33).map(path);
+            if (!(m_outline.flags & QT_FT_OUTLINE_EVEN_ODD_FILL))
+                path.setFillRule(Qt::WindingFill);
             uint old_txop = m_txop;
             m_txop = QTransform::TxNone;
@@ -248 +226 @@
 
 #ifdef QT_DEBUG_CONVERT
-    printf(" - control point rect (%.2f, %.2f) %.2f x %.2f\n",
+    printf(" - control point rect (%.2f, %.2f) %.2f x %.2f, clip=(%d,%d, %dx%d)\n",
            controlPointRect.x(), controlPointRect.y(),
-           controlPointRect.width(), controlPointRect.height());
+           controlPointRect.width(), controlPointRect.height(),
+           m_clip_rect.x(), m_clip_rect.y(), m_clip_rect.width(), m_clip_rect.height());
 #endif
 
@@ -258 +237 @@
                           || controlPointRect.right() > QT_RASTER_COORD_LIMIT
                           || controlPointRect.top() < -QT_RASTER_COORD_LIMIT
-                          || controlPointRect.bottom() > QT_RASTER_COORD_LIMIT);
+                          || controlPointRect.bottom() > QT_RASTER_COORD_LIMIT
+                          || controlPointRect.width() > QT_RASTER_COORD_LIMIT
+                          || controlPointRect.height() > QT_RASTER_COORD_LIMIT);
 
     if (do_clip) {