all the tests now pass except for MSER

2014-10-16 20:58:29 +04:00
parent 97a5dd0ead
commit c5261ea3d2
13 changed files with 730 additions and 21 deletions
--- a/modules/features2d/src/mser.cpp
+++ b/modules/features2d/src/mser.cpp
@@ -800,9 +800,12 @@ extractMSER_8uC3( const Mat& src, Mat& labels,
    double emean = 0;
    Mat dx( src.rows, src.cols-1, CV_32FC1 );
    Mat dy( src.rows, src.cols, CV_32FC1 );
+
    Ne = preprocessMSER_8UC3( map, edge, emean, src, dx, dy, Ne, params.edgeBlurSize );
    emean = emean / (double)Ne;
+
    std::sort(edge, edge + Ne, LessThanEdge());
+
    MSCREdge* edge_ub = edge+Ne;
    MSCREdge* edgeptr = edge;
    TempMSCR* mscrptr = mscr;