generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #720 from taka-no-me:drop_sort

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-01 15:14:45 +04:00
committed by OpenCV Buildbot
parent f77a375354 855acc9748
commit db45e04d58
20 changed files with 144 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/features2d/src/mser.cpp
View File

@@ -1054,10 +1054,11 @@ static int preprocessMSER_8UC3( MSCRNode* node,
return Ne;
}
#define cmp_mscr_edge(edge1, edge2) \
((edge1).chi < (edge2).chi)
static CV_IMPLEMENT_QSORT( QuickSortMSCREdge, MSCREdge, cmp_mscr_edge )
class LessThanEdge
{
public:
bool operator()(const MSCREdge& a, const MSCREdge& b) const { return a.chi < b.chi; }
};
// to find the root of one region
static MSCRNode* findMSCR( MSCRNode* x )
@@ -1112,7 +1113,7 @@ extractMSER_8UC3( CvMat* src,
CvMat* dy = cvCreateMat( src->rows-1, src->cols, CV_64FC1 );
Ne = preprocessMSER_8UC3( map, edge, &emean, src, mask, dx, dy, Ne, params.edgeBlurSize );
emean = emean / (double)Ne;
QuickSortMSCREdge( edge, Ne, 0 );
std::sort(edge, edge + Ne, LessThanEdge());
MSCREdge* edge_ub = edge+Ne;
MSCREdge* edgeptr = edge;
TempMSCR* mscrptr = mscr;