mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 10:26:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

MSER: all test passed.

Browse Source 
1. if a component's variation is a global minimum than it should be a local minimum
2. for the small image with invert and blur, the MSERs number should be 20
This commit is contained in:
will hunt 2016-08-07 08:38:38 +08:00
parent c3d2921971
commit ac2d79fd67
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ public:
return; return;
} }
} }
if( parent_ && parent_->var >= 0.f && var >= parent_->var ) if( var > 0.f && parent_ && parent_->var >= 0.f && var >= parent_->var )
return; return;
int xmin = INT_MAX, ymin = INT_MAX, xmax = INT_MIN, ymax = INT_MIN, j = 0; int xmin = INT_MAX, ymin = INT_MAX, xmax = INT_MIN, ymax = INT_MIN, j = 0;
wp.msers->push_back(vector<Point>()); wp.msers->push_back(vector<Point>());

2
modules/features2d/test/test_mser.cpp
View File

@ -132,7 +132,7 @@ TEST(Features2d_MSER, cases)
GaussianBlur(src, src, Size(5, 5), 1.5, 1.5); GaussianBlur(src, src, Size(5, 5), 1.5, 1.5);
int minRegs = use_big_image ? 7 : 2; int minRegs = use_big_image ? 7 : 2;
int maxRegs = use_big_image ? 1000 : 15; int maxRegs = use_big_image ? 1000 : 20;
if( binarize && (thresh == 0 || thresh == 255) ) if( binarize && (thresh == 0 || thresh == 255) )
minRegs = maxRegs = 0; minRegs = maxRegs = 0;

4
modules/python/test/test_mser.py
View File

@ -59,11 +59,11 @@ class mser_test(NewOpenCVTests):
if blur: if blur:
src = cv2.GaussianBlur(src, (5, 5), 1.5, 1.5) src = cv2.GaussianBlur(src, (5, 5), 1.5, 1.5)
minRegs = 7 if use_big_image else 2 minRegs = 7 if use_big_image else 2
maxRegs = 1000 if use_big_image else 15 maxRegs = 1000 if use_big_image else 20
if binarize and (thresh == 0 or thresh == 255): if binarize and (thresh == 0 or thresh == 255):
minRegs = maxRegs = 0 minRegs = maxRegs = 0
msers, boxes = mserExtractor.detectRegions(src) msers, boxes = mserExtractor.detectRegions(src)
nmsers = len(msers) nmsers = len(msers)
self.assertEqual(nmsers, len(boxes)) self.assertEqual(nmsers, len(boxes))
self.assertLessEqual(minRegs, nmsers) self.assertLessEqual(minRegs, nmsers)
self.assertGreaterEqual(maxRegs, nmsers) self.assertGreaterEqual(maxRegs, nmsers)