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

probably fixed build problems on Android

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-12-17 21:33:21 +04:00
committed by Jason Newton
parent e1b60aa4e3
commit 31857082f4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,32 +378,32 @@ int connectedComponents_sub1(const cv::Mat &I, cv::Mat &L, int connectivity, Sta
} }
int cv::connectedComponents(InputArray _I, OutputArray _L, int connectivity, int ltype){ int cv::connectedComponents(InputArray _img, OutputArray _labels, int connectivity, int ltype){
const cv::Mat I = _I.getMat(); const cv::Mat img = _img.getMat();
_L.create(I.size(), ltype); _labels.create(img.size(), CV_MAT_DEPTH(ltype));
cv::Mat L = _L.getMat(); cv::Mat labels = _labels.getMat();
connectedcomponents::NoOp sop; connectedcomponents::NoOp sop;
if(ltype == CV_16U){ if(ltype == CV_16U){
return connectedComponents_sub1(I, L, connectivity, sop); return connectedComponents_sub1(img, labels, connectivity, sop);
}else if(ltype == CV_32S){ }else if(ltype == CV_32S){
return connectedComponents_sub1(I, L, connectivity, sop); return connectedComponents_sub1(img, labels, connectivity, sop);
}else{ }else{
CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s"); CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s");
return 0; return 0;
} }
} }
int cv::connectedComponentsWithStats(InputArray _I, OutputArray _L, OutputArray statsv, int cv::connectedComponentsWithStats(InputArray _img, OutputArray _labels, OutputArray statsv,
OutputArray centroids, int connectivity, int ltype) OutputArray centroids, int connectivity, int ltype)
{ {
const cv::Mat I = _I.getMat(); const cv::Mat img = _img.getMat();
_L.create(I.size(), ltype); _labels.create(img.size(), CV_MAT_DEPTH(ltype));
cv::Mat L = _L.getMat(); cv::Mat labels = _labels.getMat();
connectedcomponents::CCStatsOp sop(statsv, centroids); connectedcomponents::CCStatsOp sop(statsv, centroids);
if(ltype == CV_16U){ if(ltype == CV_16U){
return connectedComponents_sub1(I, L, connectivity, sop); return connectedComponents_sub1(img, labels, connectivity, sop);
}else if(ltype == CV_32S){ }else if(ltype == CV_32S){
return connectedComponents_sub1(I, L, connectivity, sop); return connectedComponents_sub1(img, labels, connectivity, sop);
}else{ }else{
CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s"); CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s");
return 0; return 0;