switched to gpu::pyrDown and gpu::pyrDown in opencv_stitching

diff --git a/modules/stitching/blenders.cpp b/modules/stitching/blenders.cpp
index 99e1b15..3c35e41 100644 (file)
--- a/modules/stitching/blenders.cpp
+++ b/modules/stitching/blenders.cpp
@@ -233,7 +233,10 @@ void MultiBandBlender::feed(const Mat &img, const Mat &mask, Point tl)
     copyMakeBorder(img, img_with_border, top, bottom, left, right,\r
                    BORDER_REFLECT);\r
     vector<Mat> src_pyr_laplace;\r
-    createLaplacePyr(img_with_border, num_bands_, src_pyr_laplace);\r
+    if (can_use_gpu_)\r
+        createLaplacePyrGpu(img_with_border, num_bands_, src_pyr_laplace);\r
+    else\r
+        createLaplacePyr(img_with_border, num_bands_, src_pyr_laplace);\r
 \r
     // Create the weight map Gaussian pyramid\r
     Mat weight_map;\r
@@ -338,7 +341,6 @@ void createLaplacePyr(const Mat &img, int num_levels, vector<Mat> &pyr)
 }\r
 \r
 \r
-#if 0\r
 void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)\r
 {\r
     pyr.resize(num_levels + 1);\r
@@ -358,7 +360,6 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)
 \r
     pyr[num_levels] = gpu_pyr[num_levels];\r
 }\r
-#endif\r
 \r
 \r
 void restoreImageFromLaplacePyr(vector<Mat> &pyr)\r

diff --git a/modules/stitching/blenders.hpp b/modules/stitching/blenders.hpp
index 4595877..119d70a 100644 (file)
--- a/modules/stitching/blenders.hpp
+++ b/modules/stitching/blenders.hpp
@@ -109,10 +109,7 @@ void createWeightMap(const cv::Mat& mask, float sharpness, cv::Mat& weight);
 \r
 void createLaplacePyr(const cv::Mat &img, int num_levels, std::vector<cv::Mat>& pyr);\r
 \r
-// TODO Use it after gpu::pyrDown and gpu::pyrUp are updated\r
-#if 0\r
 void createLaplacePyrGpu(const cv::Mat &img, int num_levels, std::vector<cv::Mat>& pyr);\r
-#endif\r
 \r
 // Restores source image\r
 void restoreImageFromLaplacePyr(std::vector<cv::Mat>& pyr);\r