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

trunk/src/gui/painting/qrasterizer.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -311 +311 @@
 void qScanConvert(QScanConverter &d, T allVertical)
 {
-    qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), topOrder);
+    qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), );
     int line = 0;
     for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) {
@@ -320 +320 @@
                 d.m_active.resize(d.m_active.size() + 1);
                 int j;
-                for (j = d.m_active.size() - 2; j >= 0 && xOrder(l, d.m_active.at(j)); --j)
+                for (j = d.m_active.size() - 2; j >= 0 && (l, d.m_active.at(j)); --j)
                     d.m_active.at(j+1) = d.m_active.at(j);
                 d.m_active.at(j+1) = l;
@@ -335 +335 @@
                 QScanConverter::Line *l = d.m_active.at(i);
                 int j;
-                for (j = i-1; j >= 0 && xOrder(l, d.m_active.at(j)); --j)
+                for (j = i-1; j >= 0 && (l, d.m_active.at(j)); --j)
                     d.m_active.at(j+1) = d.m_active.at(j);
                 d.m_active.at(j+1) = l;
@@ -437 +437 @@
 {
     if (m_alloc < size) {
-        m_alloc = qMax(size, 2 * m_alloc);
-        m_intersections = (Intersection *)realloc(m_intersections, m_alloc * sizeof(Intersection));
+        int newAlloc = qMax(size, 2 * m_alloc);
+        m_intersections = q_check_ptr((Intersection *)realloc(m_intersections, newAlloc * sizeof(Intersection)));
+        m_alloc = newAlloc;
     }
 }
@@ -692 +693 @@
 }
 
-static inline qreal qRoundF(qreal v)
+static inline qreal qF(qreal v)
 {
 #ifdef QT_USE_MATH_H_FLOATS
     if (sizeof(qreal) == sizeof(float))
-        return floorf(v + 0.5);
+        return floorf(v);
     else
 #endif
-        return floor(v + 0.5);
+        return floor(v);
 }
 
 void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width, bool squareCap)
 {
-    if (a == b || width == 0)
+    if (a == b || width == 0)
         return;
+
+
 
     QPointF pa = a;
     QPointF pb = b;
 
-    QPointF offs = QPointF(qAbs(b.y() - a.y()), qAbs(b.x() - a.x())) * width * 0.5;
+    QPointF offs = QPointF(qAbs(b.y() - a.y()), qAbs(b.x() - a.x())) * width * 0.5;
     if (squareCap)
         offs += QPointF(offs.y(), offs.x());
@@ -759 +762 @@
 
         // snap to grid to prevent large slopes
-        pa.rx() = qRoundF(pa.rx() * gridResolution) * reciprocal;
-        pa.ry() = qRoundF(pa.ry() * gridResolution) * reciprocal;
-        pb.rx() = qRoundF(pb.rx() * gridResolution) * reciprocal;
-        pb.ry() = qRoundF(pb.ry() * gridResolution) * reciprocal;
+        pa.rx() = qF(pa.rx() * gridResolution) * reciprocal;
+        pa.ry() = qF(pa.ry() * gridResolution) * reciprocal;
+        pb.rx() = qF(pb.rx() * gridResolution) * reciprocal;
+        pb.ry() = qF(pb.ry() * gridResolution) * reciprocal;
 
         // old delta