Added a test for the multi-band blender

diff --git a/modules/stitching/include/opencv2/stitching/detail/blenders.hpp b/modules/stitching/include/opencv2/stitching/detail/blenders.hpp
index 42f1b3c..a5980bd 100644 (file)
--- a/modules/stitching/include/opencv2/stitching/detail/blenders.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/blenders.hpp
@@ -48,6 +48,7 @@
 namespace cv {\r
 namespace detail {\r
 \r
+\r
 // Simple blender which puts one image over another\r
 class CV_EXPORTS Blender\r
 {\r
@@ -96,6 +97,7 @@ class CV_EXPORTS MultiBandBlender : public Blender
 {\r
 public:\r
     MultiBandBlender(int try_gpu = false, int num_bands = 5);\r
+\r
     int numBands() const { return actual_num_bands_; }\r
     void setNumBands(int val) { actual_num_bands_ = val; }\r
 \r

diff --git a/modules/stitching/test/test_blenders.cpp b/modules/stitching/test/test_blenders.cpp
new file mode 100644 (file)
index 0000000..1ce0358
--- /dev/null
+++ b/modules/stitching/test/test_blenders.cpp
@@ -0,0 +1,78 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "test_precomp.hpp"
+
+using namespace cv;
+using namespace std;
+
+TEST(MultiBandBlender, CanBlendTwoImages)
+{    
+    Mat image1 = imread(string(cvtest::TS::ptr()->get_data_path()) + "cv/shared/baboon.jpg");
+    Mat image2 = imread(string(cvtest::TS::ptr()->get_data_path()) + "cv/shared/lena.jpg");
+    EXPECT_EQ(image1.rows, image2.rows); EXPECT_EQ(image1.cols, image2.cols);
+
+    Mat image1s, image2s;
+    image1.convertTo(image1s, CV_16S);
+    image2.convertTo(image2s, CV_16S);
+
+    Mat mask1(image1s.size(), CV_8U);
+    mask1(Rect(0, 0, mask1.cols/2, mask1.rows)).setTo(255);
+    mask1(Rect(mask1.cols/2, 0, mask1.cols - mask1.cols/2, mask1.rows)).setTo(0);
+
+    Mat mask2(image2s.size(), CV_8U);
+    mask2(Rect(0, 0, mask2.cols/2, mask2.rows)).setTo(0);
+    mask2(Rect(mask2.cols/2, 0, mask2.cols - mask2.cols/2, mask2.rows)).setTo(255);
+
+    detail::MultiBandBlender blender(false, 5);
+
+    blender.prepare(Rect(0, 0, max(image1s.cols, image2s.cols), max(image1s.rows, image2s.rows)));
+    blender.feed(image1s, mask1, Point(0,0));
+    blender.feed(image2s, mask2, Point(0,0));
+
+    Mat result_s, result_mask;
+    blender.blend(result_s, result_mask);
+    Mat result; result_s.convertTo(result, CV_8U);
+
+    Mat expected = imread(string(cvtest::TS::ptr()->get_data_path()) + "stitching/baboon_lena.png");
+    double error = norm(expected, result, NORM_L2) / expected.size().area();
+    ASSERT_LT(error, 1e-3);
+}

diff --git a/modules/stitching/test/test_main.cpp b/modules/stitching/test/test_main.cpp
index 284b643..de8dca2 100644 (file)
--- a/modules/stitching/test/test_main.cpp
+++ b/modules/stitching/test/test_main.cpp
@@ -1,3 +1,3 @@
 #include "test_precomp.hpp"\r
 \r
-CV_TEST_MAIN("cv")\r
+CV_TEST_MAIN(".")\r

diff --git a/modules/stitching/test/test_matchers.cpp b/modules/stitching/test/test_matchers.cpp
index 424756f..9600d9d 100644 (file)
--- a/modules/stitching/test/test_matchers.cpp
+++ b/modules/stitching/test/test_matchers.cpp
@@ -47,7 +47,7 @@ using namespace std;
 TEST(SurfFeaturesFinder, CanFindInROIs)\r
 {\r
     Ptr<detail::FeaturesFinder> finder = new detail::SurfFeaturesFinder();\r
-    Mat img  = imread(string(cvtest::TS::ptr()->get_data_path()) + "shared/lena.jpg");\r
+    Mat img  = imread(string(cvtest::TS::ptr()->get_data_path()) + "cv/shared/lena.jpg");\r
 \r
     vector<Rect> rois;\r
     rois.push_back(Rect(0, 0, img.cols / 2, img.rows / 2));\r
@@ -70,4 +70,4 @@ TEST(SurfFeaturesFinder, CanFindInROIs)
     ASSERT_GT(tl_rect_count, 0);\r
     ASSERT_GT(br_rect_count, 0);\r
     ASSERT_EQ(bad_count, 0);\r
-}
\ No newline at end of file
+}\r

diff --git a/modules/stitching/test/test_precomp.hpp b/modules/stitching/test/test_precomp.hpp
index 13f1c79..867753f 100644 (file)
--- a/modules/stitching/test/test_precomp.hpp
+++ b/modules/stitching/test/test_precomp.hpp
@@ -7,5 +7,6 @@
 #include <opencv2/highgui/highgui.hpp>\r
 #include <opencv2/stitching/stitcher.hpp>\r
 #include <opencv2/stitching/detail/matchers.hpp>\r
+#include <opencv2/stitching/detail/blenders.hpp>\r
 \r
 #endif\r