Merge pull request #8796 from liurs1990:master

This commit is contained in:
Vadim Pisarevsky 2017-05-26 12:04:56 +00:00
commit d962b3f499

2
modules/features2d/src/mser.cpp Normal file → Executable file
View File

@ -335,6 +335,8 @@ public:
head = comp1->head; head = comp1->head;
tail = comp2->tail; tail = comp2->tail;
size = comp1->size + comp2->size; size = comp1->size + comp2->size;
// update the history size
history->size =size;
CompHistory *h1 = history->child_; CompHistory *h1 = history->child_;
CompHistory *h2 = comp2->history; CompHistory *h2 = comp2->history;