generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Newton 2012-12-08 22:06:15 -08:00
parent e70b3ef598
commit d094e4bdbe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/src/connectedcomponents.cpp
View File

@ -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
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);