renamed gpustereo -> cudastereo

11 years ago · 71d61e07b1
parent d4901a99ea
commit 71d61e07b1
29 changed files with 21 additions and 21 deletions
--- a/modules/cudastereo/CMakeLists.txt
+++ b/modules/cudastereo/CMakeLists.txt
@ -0,0 +1,9 @@
+if(ANDROID OR IOS)
+  ocv_module_disable(cudastereo)
+endif()
+
+set(the_description "CUDA-accelerated Stereo Correspondence")
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
+
+ocv_define_module(cudastereo opencv_calib3d)
--- a/modules/cudastereo/doc/cudastereo.rst
+++ b/modules/cudastereo/doc/cudastereo.rst
--- a/modules/cudastereo/doc/stereo.rst
+++ b/modules/cudastereo/doc/stereo.rst
--- a/modules/cudastereo/include/opencv2/cudastereo.hpp
+++ b/modules/cudastereo/include/opencv2/cudastereo.hpp
@ -40,11 +40,11 @@
 //
 //M*/

-#ifndef __OPENCV_GPUSTEREO_HPP__
-#define __OPENCV_GPUSTEREO_HPP__
+#ifndef __OPENCV_CUDASTEREO_HPP__
+#define __OPENCV_CUDASTEREO_HPP__

 #ifndef __cplusplus
-#  error gpustereo.hpp header must be compiled as C++
+#  error cudastereo.hpp header must be compiled as C++
 #endif

 #include "opencv2/core/cuda.hpp"
@ -190,4 +190,4 @@ CV_EXPORTS void drawColorDisp(InputArray src_disp, OutputArray dst_disp, int ndi

 }} // namespace cv { namespace cuda {

-#endif /* __OPENCV_GPUSTEREO_HPP__ */
+#endif /* __OPENCV_CUDASTEREO_HPP__ */
--- a/modules/cudastereo/perf/perf_main.cpp
+++ b/modules/cudastereo/perf/perf_main.cpp
@ -44,4 +44,4 @@

 using namespace perf;

-CV_PERF_TEST_CUDA_MAIN(gpustereo)
+CV_PERF_TEST_CUDA_MAIN(cudastereo)
--- a/modules/cudastereo/perf/perf_precomp.cpp
+++ b/modules/cudastereo/perf/perf_precomp.cpp
--- a/modules/cudastereo/perf/perf_precomp.hpp
+++ b/modules/cudastereo/perf/perf_precomp.hpp
@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"

-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"
 #include "opencv2/calib3d.hpp"

 #ifdef GTEST_CREATE_SHARED_LIBRARY
--- a/modules/cudastereo/perf/perf_stereo.cpp
+++ b/modules/cudastereo/perf/perf_stereo.cpp
--- a/modules/cudastereo/src/cuda/disparity_bilateral_filter.cu
+++ b/modules/cudastereo/src/cuda/disparity_bilateral_filter.cu
--- a/modules/cudastereo/src/cuda/stereobm.cu
+++ b/modules/cudastereo/src/cuda/stereobm.cu
--- a/modules/cudastereo/src/cuda/stereobp.cu
+++ b/modules/cudastereo/src/cuda/stereobp.cu
--- a/modules/cudastereo/src/cuda/stereocsbp.cu
+++ b/modules/cudastereo/src/cuda/stereocsbp.cu
--- a/modules/cudastereo/src/cuda/util.cu
+++ b/modules/cudastereo/src/cuda/util.cu
--- a/modules/cudastereo/src/disparity_bilateral_filter.cpp
+++ b/modules/cudastereo/src/disparity_bilateral_filter.cpp
--- a/modules/cudastereo/src/precomp.cpp
+++ b/modules/cudastereo/src/precomp.cpp
--- a/modules/cudastereo/src/precomp.hpp
+++ b/modules/cudastereo/src/precomp.hpp
@ -45,7 +45,7 @@

 #include <limits>

-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"

 #include "opencv2/core/private.cuda.hpp"
 #include "opencv2/core/utility.hpp"
--- a/modules/cudastereo/src/stereobm.cpp
+++ b/modules/cudastereo/src/stereobm.cpp
--- a/modules/cudastereo/src/stereobp.cpp
+++ b/modules/cudastereo/src/stereobp.cpp
--- a/modules/cudastereo/src/stereocsbp.cpp
+++ b/modules/cudastereo/src/stereocsbp.cpp
--- a/modules/cudastereo/src/util.cpp
+++ b/modules/cudastereo/src/util.cpp
--- a/modules/cudastereo/test/test_main.cpp
+++ b/modules/cudastereo/test/test_main.cpp
--- a/modules/cudastereo/test/test_precomp.cpp
+++ b/modules/cudastereo/test/test_precomp.cpp
--- a/modules/cudastereo/test/test_precomp.hpp
+++ b/modules/cudastereo/test/test_precomp.hpp
@ -54,7 +54,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"

-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"
 #include "opencv2/calib3d.hpp"

 #include "cvconfig.h"
--- a/modules/cudastereo/test/test_stereo.cpp
+++ b/modules/cudastereo/test/test_stereo.cpp
--- a/modules/gpustereo/CMakeLists.txt
+++ b/modules/gpustereo/CMakeLists.txt
@ -1,9 +0,0 @@
-if(ANDROID OR IOS)
-  ocv_module_disable(gpustereo)
-endif()
-
-set(the_description "GPU-accelerated Stereo Correspondence")
-
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
-
-ocv_define_module(gpustereo opencv_calib3d)
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@ -4,7 +4,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
                                     opencv_nonfree opencv_softcascade opencv_superres
                                     opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc
                                     opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
-                                     opencv_gpustereo opencv_cudalegacy)
+                                     opencv_cudastereo opencv_cudalegacy)

 ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})

--- a/samples/gpu/driver_api_stereo_multi.cpp
+++ b/samples/gpu/driver_api_stereo_multi.cpp
@ -11,7 +11,7 @@
 #include "cvconfig.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"

 #ifdef HAVE_TBB
 #  include "tbb/tbb_stddef.h"
--- a/samples/gpu/stereo_match.cpp
+++ b/samples/gpu/stereo_match.cpp
@ -4,7 +4,7 @@
 #include <iomanip>
 #include <stdexcept>
 #include <opencv2/core/utility.hpp>
-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"

--- a/samples/gpu/stereo_multi.cpp
+++ b/samples/gpu/stereo_multi.cpp
@ -11,7 +11,7 @@
 #include "cvconfig.h"
 #include "opencv2/core.hpp"
 #include "opencv2/highgui.hpp"
-#include "opencv2/gpustereo.hpp"
+#include "opencv2/cudastereo.hpp"

 #ifdef HAVE_TBB
 #  include "tbb/tbb_stddef.h"