feature-match: remove residual UMat codes

2 files changed, 12 insertions, 41 deletions

diff --git a/modules/ocv/cv_feature_match.cpp b/modules/ocv/cv_feature_match.cpp
index 2ef4b82..201cbc2 100644
--- a/modules/ocv/cv_feature_match.cpp
+++ b/modules/ocv/cv_feature_match.cpp
@@ -151,25 +151,15 @@ CVFeatureMatch::calc_of_match (
 
 #if XCAM_CV_FM_DEBUG
     cv::Mat mat;
-    cv::UMat umat;
     cv::Size img1_size = image1.size ();
     cv::Size size (img0_size.width + img1_size.width, img0_size.height);
 
-    if (image0.isUMat ()) {
-        umat.create (size, image0.type ());
-        debug_img = cv::_InputOutputArray (umat);
-
-        image0.copyTo (umat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (umat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
-        umat.copyTo (debug_img);
-    } else {
-        mat.create (size, image0.type ());
-        debug_img = cv::_InputOutputArray (mat);
+    mat.create (size, image0.type ());
+    debug_img = cv::_InputOutputArray (mat);
 
-        image0.copyTo (mat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (mat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
-        mat.copyTo (debug_img);
-    }
+    image0.copyTo (mat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
+    image1.copyTo (mat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
+    mat.copyTo (debug_img);
 
     cv::Size scale_size = size * XCAM_CV_OF_DRAW_SCALE;
     cv::resize (debug_img, debug_img, scale_size, 0, 0);
@@ -239,9 +229,6 @@ CVFeatureMatch::detect_and_match (
     cv::Ptr<cv::Feature2D> fast_detector;
     cv::Size win_size = cv::Size (5, 5);
 
-    if (img_left.isUMat ())
-        win_size = cv::Size (16, 16);
-
     fast_detector = cv::FastFeatureDetector::create (20, true);
     add_detected_data (img_left, fast_detector, corner_left);
 
diff --git a/modules/ocv/cv_feature_match_cluster.cpp b/modules/ocv/cv_feature_match_cluster.cpp
index 85a5be5..8725103 100644
--- a/modules/ocv/cv_feature_match_cluster.cpp
+++ b/modules/ocv/cv_feature_match_cluster.cpp
@@ -198,31 +198,18 @@ CVFeatureMatchCluster::calc_of_match_cluster (
 
 #if XCAM_CV_FM_DEBUG
     cv::Mat mat;
-    cv::UMat umat;
     cv::Size size ((img0_size.width + img1_size.width) * 2, img0_size.height);
 
-    if (image0.isUMat ()) {
-        umat.create (size, image0.type ());
-        debug_img = cv::_InputOutputArray (umat);
+    mat.create (size, image0.type ());
+    debug_img = cv::_InputOutputArray (mat);
 
-        image0.copyTo (umat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (umat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
+    image0.copyTo (mat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
+    image1.copyTo (mat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
 
-        image0.copyTo (umat (cv::Rect(img0_size.width + img1_size.width, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (umat (cv::Rect(2 * img0_size.width + img1_size.width, 0, img1_size.width, img1_size.height)));
-        umat.copyTo (debug_img);
-    } else {
-        mat.create (size, image0.type ());
-        debug_img = cv::_InputOutputArray (mat);
+    image0.copyTo (mat (cv::Rect(img0_size.width + img1_size.width, 0, img0_size.width, img0_size.height)));
+    image1.copyTo (mat (cv::Rect(2 * img0_size.width + img1_size.width, 0, img1_size.width, img1_size.height)));
 
-        image0.copyTo (mat (cv::Rect(0, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (mat (cv::Rect(img0_size.width, 0, img1_size.width, img1_size.height)));
-
-        image0.copyTo (mat (cv::Rect(img0_size.width + img1_size.width, 0, img0_size.width, img0_size.height)));
-        image1.copyTo (mat (cv::Rect(2 * img0_size.width + img1_size.width, 0, img1_size.width, img1_size.height)));
-
-        mat.copyTo (debug_img);
-    }
+    mat.copyTo (debug_img);
 
     cv::Size scale_size = size * XCAM_CV_OF_DRAW_SCALE;
     cv::resize (debug_img, debug_img, scale_size, 0, 0);
@@ -269,9 +256,6 @@ CVFeatureMatchCluster::detect_and_match_cluster (
     cv::Ptr<cv::Feature2D> fast_detector;
     cv::Size win_size = cv::Size (21, 21);
 
-    if (img_left.isUMat ())
-        win_size = cv::Size (16, 16);
-
     fast_detector = cv::FastFeatureDetector::create (20, true);
     add_detected_data (img_left, fast_detector, corner_left);