From d304a55e1ea0426a5c76625f7fcfb2ab4aac5a97 Mon Sep 17 00:00:00 2001
From: Alexander Mordvintsev <no@email>
Date: Wed, 28 Mar 2012 04:44:33 +0000
Subject: [PATCH] gpu.hpp:filterSpeckles conflicts with calib3d.hpp -- should
 it be removed at all?

---
 modules/gpu/include/opencv2/gpu/gpu.hpp | 5 -----
 modules/gpu/src/speckle_filtering.cpp   | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index d02abefaba..0cf85cebd1 100644
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -1885,11 +1885,6 @@ CV_EXPORTS void createOpticalFlowNeedleMap(const GpuMat& u, const GpuMat& v, Gpu
 
 } // namespace gpu
 
-//! Speckle filtering - filters small connected components on diparity image.
-//! It sets pixel (x,y) to newVal if it coresponds to small CC with size < maxSpeckleSize.
-//! Threshold for border between CC is diffThreshold;
-CV_EXPORTS void filterSpeckles(Mat& img, uchar newVal, int maxSpeckleSize, uchar diffThreshold, Mat& buf);
-
 } // namespace cv
 
 #endif /* __OPENCV_GPU_HPP__ */
diff --git a/modules/gpu/src/speckle_filtering.cpp b/modules/gpu/src/speckle_filtering.cpp
index f714314e58..d8a6b5a831 100644
--- a/modules/gpu/src/speckle_filtering.cpp
+++ b/modules/gpu/src/speckle_filtering.cpp
@@ -44,6 +44,15 @@
 
 using namespace cv;
 
+namespace cv {
+// TODO: conflicts with calib3d.hpp : filterSpeckles, should be removed ?
+
+//! Speckle filtering - filters small connected components on diparity image.
+//! It sets pixel (x,y) to newVal if it coresponds to small CC with size < maxSpeckleSize.
+//! Threshold for border between CC is diffThreshold;
+  CV_EXPORTS void filterSpeckles(Mat& img, uchar newVal, int maxSpeckleSize, uchar diffThreshold, Mat& buf);
+}
+
 typedef Point_<short> Point2s;
 
 void cv::filterSpeckles( Mat& img, uchar newVal, int maxSpeckleSize, uchar maxDiff, Mat& _buf)