1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #8796 from liurs1990:master

This commit is contained in:
Vadim Pisarevsky
2017-05-26 12:04:56 +00:00
Regular → Executable
+2
View File
@@ -335,6 +335,8 @@ public:
head = comp1->head;
tail = comp2->tail;
size = comp1->size + comp2->size;
// update the history size
history->size =size;
CompHistory *h1 = history->child_;
CompHistory *h2 = comp2->history;