Commit 366f859a authored by Vladislav Vinogradov's avatar Vladislav Vinogradov Committed by Vladislav Vinogradov

fixed compilation after CV_IMPLEMENT_QSORT_EX removing

parent db45e04d
...@@ -586,8 +586,17 @@ namespace ...@@ -586,8 +586,17 @@ namespace
edgePointList.cols = func(edges, dx, dy, edgePointList.ptr<unsigned int>(0), edgePointList.ptr<float>(1)); edgePointList.cols = func(edges, dx, dy, edgePointList.ptr<unsigned int>(0), edgePointList.ptr<float>(1));
} }
#define votes_cmp_gt(l1, l2) (aux[l1].x > aux[l2].x) struct IndexCmp
static CV_IMPLEMENT_QSORT_EX( sortIndexies, int, votes_cmp_gt, const int3* ) {
const int3* aux;
explicit IndexCmp(const int3* _aux) : aux(_aux) {}
bool operator ()(int l1, int l2) const
{
return aux[l1].x > aux[l2].x;
}
};
void GHT_Pos::filterMinDist() void GHT_Pos::filterMinDist()
{ {
...@@ -600,7 +609,7 @@ namespace ...@@ -600,7 +609,7 @@ namespace
indexies.resize(posCount); indexies.resize(posCount);
for (int i = 0; i < posCount; ++i) for (int i = 0; i < posCount; ++i)
indexies[i] = i; indexies[i] = i;
sortIndexies(&indexies[0], posCount, &oldVoteBuf[0]); std::sort(indexies.begin(), indexies.end(), IndexCmp(&oldVoteBuf[0]));
newPosBuf.clear(); newPosBuf.clear();
newVoteBuf.clear(); newVoteBuf.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment