Skip to content

O
opencv
Commit d094e4bd authored by Jason Newton's avatar Jason Newton
Browse files
Options

drop support for 8bit output for size cost relative to utility

parent e70b3ef5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
modules/imgproc/src/connectedcomponents.cpp
View file @ d094e4bd
...@@ -414,9 +414,7 @@ int connectedComponents(InputArray _I, OutputArray _L, int connectivity, int lty ...@@ -414,9 +414,7 @@ int connectedComponents(InputArray _I, OutputArray _L, int connectivity, int lty
const cv::Mat I = _I.getMat(); const cv::Mat I = _I.getMat();
_L.create(I.size(), CV_MAT_TYPE(ltype)); _L.create(I.size(), CV_MAT_TYPE(ltype));
cv::Mat L = _L.getMat(); cv::Mat L = _L.getMat();
if(ltype == CV_8U){ if(ltype == CV_16U){
connectedcomponents::NoOp<uint8_t> sop; return connectedComponents_sub1(I, L, connectivity, sop);
}else if(ltype == CV_16U){
connectedcomponents::NoOp<uint16_t> sop; return connectedComponents_sub1(I, L, connectivity, sop); connectedcomponents::NoOp<uint16_t> sop; return connectedComponents_sub1(I, L, connectivity, sop);
}else if(ltype == CV_32S){ }else if(ltype == CV_32S){
connectedcomponents::NoOp<uint32_t> sop; return connectedComponents_sub1(I, L, connectivity, sop); connectedcomponents::NoOp<uint32_t> sop; return connectedComponents_sub1(I, L, connectivity, sop);
...@@ -430,9 +428,7 @@ int connectedComponentsWithStats(InputArray _I, OutputArray _L, OutputArray stat ...@@ -430,9 +428,7 @@ int connectedComponentsWithStats(InputArray _I, OutputArray _L, OutputArray stat
const cv::Mat I = _I.getMat(); const cv::Mat I = _I.getMat();
_L.create(I.size(), CV_MAT_TYPE(ltype)); _L.create(I.size(), CV_MAT_TYPE(ltype));
cv::Mat L = _L.getMat(); cv::Mat L = _L.getMat();
if(ltype == CV_8U){ if(ltype == CV_16U){
connectedcomponents::CCStatsOp<uint8_t> sop(statsv, centroids); return connectedComponents_sub1(I, L, connectivity, sop);
}else if(ltype == CV_16U){
connectedcomponents::CCStatsOp<uint16_t> sop(statsv, centroids); return connectedComponents_sub1(I, L, connectivity, sop); connectedcomponents::CCStatsOp<uint16_t> sop(statsv, centroids); return connectedComponents_sub1(I, L, connectivity, sop);
}else if(ltype == CV_32S){ }else if(ltype == CV_32S){
connectedcomponents::CCStatsOp<uint32_t> sop(statsv, centroids); return connectedComponents_sub1(I, L, connectivity, sop); connectedcomponents::CCStatsOp<uint32_t> sop(statsv, centroids); return connectedComponents_sub1(I, L, connectivity, sop);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment