potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Maksim Shabunin
2017-02-26 07:46:59 +03:00
committed by GitHub
parent 89a0a46a69 dcbed8d676
commit 0d7666a012
607 changed files with 67106 additions and 19932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/connectedcomponents.cpp
+3 -2
View File
@@ -645,6 +645,7 @@ namespace cv{
}
};//End struct LabelingWuParallel
//Based on "Two Strategies to Speed up Connected Components Algorithms", the SAUF (Scan array union find) variant
//using decision trees
//Kesheng Wu, et al
@@ -816,7 +817,7 @@ namespace cv{
};//End struct LabelingWu
// Based on “Optimized Block-based Connected Components Labeling with Decision Trees”, Costantino Grana et al
// Based on "Optimized Block-based Connected Components Labeling with Decision Trees", Costantino Grana et al
// Only for 8-connectivity
template<typename LabelT, typename PixelT, typename StatsOp = NoOp >
struct LabelingGranaParallel{
@@ -2581,7 +2582,7 @@ namespace cv{
}
};//End struct LabelingGranaParallel
// Based on “Optimized Block-based Connected Components Labeling with Decision Trees”, Costantino Grana et al
// Based on �Optimized Block-based Connected Components Labeling with Decision Trees�, Costantino Grana et al
// Only for 8-connectivity
template<typename LabelT, typename PixelT, typename StatsOp = NoOp >
struct LabelingGrana{