From 15b1b4e2321357ade4732243c128a6e295589616 Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Wed, 31 Aug 2011 13:26:33 +0000
Subject: [PATCH] switched to gpu::pyrDown and gpu::pyrDown in opencv_stitching

---
 modules/stitching/blenders.cpp | 7 ++++---
 modules/stitching/blenders.hpp | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/stitching/blenders.cpp b/modules/stitching/blenders.cpp
index 99e1b15e30..3c35e41a88 100644
--- 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,
                    BORDER_REFLECT);
     vector<Mat> src_pyr_laplace;
-    createLaplacePyr(img_with_border, num_bands_, src_pyr_laplace);
+    if (can_use_gpu_)
+        createLaplacePyrGpu(img_with_border, num_bands_, src_pyr_laplace);
+    else
+        createLaplacePyr(img_with_border, num_bands_, src_pyr_laplace);
 
     // Create the weight map Gaussian pyramid
     Mat weight_map;
@@ -338,7 +341,6 @@ void createLaplacePyr(const Mat &img, int num_levels, vector<Mat> &pyr)
 }
 
 
-#if 0
 void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)
 {
     pyr.resize(num_levels + 1);
@@ -358,7 +360,6 @@ void createLaplacePyrGpu(const Mat &img, int num_levels, vector<Mat> &pyr)
 
     pyr[num_levels] = gpu_pyr[num_levels];
 }
-#endif
 
 
 void restoreImageFromLaplacePyr(vector<Mat> &pyr)
diff --git a/modules/stitching/blenders.hpp b/modules/stitching/blenders.hpp
index 4595877ecc..119d70a314 100644
--- 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);
 
 void createLaplacePyr(const cv::Mat &img, int num_levels, std::vector<cv::Mat>& pyr);
 
-// TODO Use it after gpu::pyrDown and gpu::pyrUp are updated
-#if 0
 void createLaplacePyrGpu(const cv::Mat &img, int num_levels, std::vector<cv::Mat>& pyr);
-#endif
 
 // Restores source image
 void restoreImageFromLaplacePyr(std::vector<cv::Mat>& pyr);
-- 
GitLab