mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #746 from jet47:fix-gpu-compilation

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-03 15:58:47 +04:00 committed by OpenCV Buildbot
commit 422803e866
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gpu/src/hough.cpp
View File

@ -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
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();