From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Mon, 17 Dec 2012 17:33:21 +0000 (+0400)
Subject: probably fixed build problems on Android
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1210^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31857082f4bbfb124b39399e8381efa2a93f0956;p=profile%2Fivi%2Fopencv.git

probably fixed build problems on Android
---

diff --git a/modules/imgproc/src/connectedcomponents.cpp b/modules/imgproc/src/connectedcomponents.cpp
index 6965586..4fee0aa 100644
--- a/modules/imgproc/src/connectedcomponents.cpp
+++ b/modules/imgproc/src/connectedcomponents.cpp
@@ -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){
-    const cv::Mat I = _I.getMat();
-    _L.create(I.size(), ltype);
-    cv::Mat L = _L.getMat();
+int cv::connectedComponents(InputArray _img, OutputArray _labels, int connectivity, int ltype){
+    const cv::Mat img = _img.getMat();
+    _labels.create(img.size(), CV_MAT_DEPTH(ltype));
+    cv::Mat labels = _labels.getMat();
     connectedcomponents::NoOp sop;
     if(ltype == CV_16U){
-        return connectedComponents_sub1(I, L, connectivity, sop);
+        return connectedComponents_sub1(img, labels, connectivity, sop);
     }else if(ltype == CV_32S){
-        return connectedComponents_sub1(I, L, connectivity, sop);
+        return connectedComponents_sub1(img, labels, connectivity, sop);
     }else{
         CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s");
         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)
 {
-    const cv::Mat I = _I.getMat();
-    _L.create(I.size(), ltype);
-    cv::Mat L = _L.getMat();
+    const cv::Mat img = _img.getMat();
+    _labels.create(img.size(), CV_MAT_DEPTH(ltype));
+    cv::Mat labels = _labels.getMat();
     connectedcomponents::CCStatsOp sop(statsv, centroids); 
     if(ltype == CV_16U){
-        return connectedComponents_sub1(I, L, connectivity, sop);
+        return connectedComponents_sub1(img, labels, connectivity, sop);
     }else if(ltype == CV_32S){
-        return connectedComponents_sub1(I, L, connectivity, sop);
+        return connectedComponents_sub1(img, labels, connectivity, sop);
     }else{
         CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s");
         return 0;