whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPathClipper: remove homebrew 'qRemoveDuplicates' algorithm 

Use std::unique

Change-Id: Iae2e80d16b5a443ee5023224f48c325197c23029
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Anton Kudryavtsev 2016-10-12 16:56:20 +03:00
parent 6a35e77ef3
commit fca0aa676e
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/painting/qpathclipper.cpp
View File

@ -1458,25 +1458,6 @@ QPathClipper::QPathClipper(const QPainterPath &subject,
bMask = clipPath.fillRule() == Qt::WindingFill ? ~0x0 : 0x1;
}
template <typename Iterator, typename Equality>
Iterator qRemoveDuplicates(Iterator begin, Iterator end, Equality eq)
{
if (begin == end)
return end;
Iterator last = begin;
++begin;
Iterator insert = begin;
for (Iterator it = begin; it != end; ++it) {
if (!eq(*it, *last)) {
*insert++ = *it;
last = it;
}
}
return insert;
}
static void clear(QWingedEdge& list, int edge, QPathEdge::Traversal traversal)
{
QWingedEdge::TraversalStatus status;
@ -1643,7 +1624,7 @@ bool QPathClipper::doClip(QWingedEdge &list, ClipperMode mode)
y_coords << list.vertex(i)->y;
std::sort(y_coords.begin(), y_coords.end());
y_coords.resize(qRemoveDuplicates(y_coords.begin(), y_coords.end(), fuzzyCompare) - y_coords.begin());
y_coords.erase(std::unique(y_coords.begin(), y_coords.end(), fuzzyCompare), y_coords.end());
#ifdef QDEBUG_CLIPPER
printf("sorted y coords:\n");