summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
diff options
context:
space:
mode:
authorJani Hautakangas <jani.hautakangas@nokia.com>2010-10-04 19:34:49 (GMT)
committerJani Hautakangas <jani.hautakangas@nokia.com>2010-10-04 19:36:48 (GMT)
commit2ab99337faa0ec03721fb39cae52361f7ac4d780 (patch)
treea2bd21946b1e0c4588b18851c1648024c09510e1 /src/opengl/gl2paintengineex
parent25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0 (diff)
downloadQt-2ab99337faa0ec03721fb39cae52361f7ac4d780.zip
Qt-2ab99337faa0ec03721fb39cae52361f7ac4d780.tar.gz
Qt-2ab99337faa0ec03721fb39cae52361f7ac4d780.tar.bz2
Fix gcc compilation problems in QtOpenGL. Actually was typo and
for some reason rvct didn't catch that. Reviewed-by: TRUSTME
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qtriangulator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp
index ea072b4..bf21240 100644
--- a/src/opengl/gl2paintengineex/qtriangulator.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
@@ -2025,7 +2025,7 @@ void QTriangulator<T>::ComplexToSimple::fillPriorityQueue()
Q_ASSERT(m_edges.at(i).previous == -1 && m_edges.at(i).next == -1);
Q_ASSERT(m_edges.at(i).node == 0);
Q_ASSERT(m_edges.at(i).pointingUp == m_edges.at(i).originallyPointingUp);
- Q_ASSERT(m_edges.at(i).pointingUp == (m_parent->m_vertices.at(qint32)(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from)));
+ Q_ASSERT(m_edges.at(i).pointingUp == (m_parent->m_vertices.at(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from)));
// Ignore zero-length edges.
if (m_parent->m_vertices.at(m_edges.at(i).to) != m_parent->m_vertices.at(m_edges.at(i).from)) {
QPodPoint upper = m_parent->m_vertices.at(m_edges.at(i).upper());
@@ -2214,7 +2214,7 @@ void QTriangulator<T>::ComplexToSimple::removeUnwantedEdgesAndConnect()
while (current != b.second) {
Q_ASSERT(current);
Q_ASSERT(m_edges.at(current->data).node == current);
- Q_ASSERT(qIntersectionPoint(event.point).isOnLine(m_parent->m_vertices.at(m_edges.at(current->data).from), m_parent->m_vertices.at(qint32)(m_edges.at(current->data).to)));
+ Q_ASSERT(qIntersectionPoint(event.point).isOnLine(m_parent->m_vertices.at(m_edges.at(current->data).from), m_parent->m_vertices.at(m_edges.at(current->data).to)));
Q_ASSERT(m_parent->m_vertices.at(m_edges.at(current->data).from) == event.point || m_parent->m_vertices.at(m_edges.at(current->data).to) == event.point);
insertEdgeIntoVectorIfWanted(orderedEdges, current->data);
current = m_edgeList.next(current);