From 29386f1449afe3cb859e4b16def307c3c63793fe Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 24 Jul 2013 10:44:39 +0400 Subject: [PATCH] renamed gpubgsegm -> cudabgsegm --- modules/cudabgsegm/CMakeLists.txt | 9 +++++++++ .../doc/background_segmentation.rst | 0 .../doc/gpubgsegm.rst => cudabgsegm/doc/cudabgsegm.rst} | 0 .../include/opencv2/cudabgsegm.hpp} | 8 ++++---- modules/{gpubgsegm => cudabgsegm}/perf/perf_bgsegm.cpp | 0 modules/{gpubgsegm => cudabgsegm}/perf/perf_main.cpp | 2 +- modules/{gpubgsegm => cudabgsegm}/perf/perf_precomp.cpp | 0 modules/{gpubgsegm => cudabgsegm}/perf/perf_precomp.hpp | 2 +- modules/{gpubgsegm => cudabgsegm}/src/cuda/fgd.cu | 0 modules/{gpubgsegm => cudabgsegm}/src/cuda/fgd.hpp | 0 modules/{gpubgsegm => cudabgsegm}/src/cuda/gmg.cu | 0 modules/{gpubgsegm => cudabgsegm}/src/cuda/mog.cu | 0 modules/{gpubgsegm => cudabgsegm}/src/cuda/mog2.cu | 0 modules/{gpubgsegm => cudabgsegm}/src/fgd.cpp | 0 modules/{gpubgsegm => cudabgsegm}/src/gmg.cpp | 0 modules/{gpubgsegm => cudabgsegm}/src/mog.cpp | 0 modules/{gpubgsegm => cudabgsegm}/src/mog2.cpp | 0 modules/{gpubgsegm => cudabgsegm}/src/precomp.cpp | 0 modules/{gpubgsegm => cudabgsegm}/src/precomp.hpp | 2 +- modules/{gpubgsegm => cudabgsegm}/test/test_bgsegm.cpp | 0 modules/{gpubgsegm => cudabgsegm}/test/test_main.cpp | 0 modules/{gpubgsegm => cudabgsegm}/test/test_precomp.cpp | 0 modules/{gpubgsegm => cudabgsegm}/test/test_precomp.hpp | 2 +- modules/gpubgsegm/CMakeLists.txt | 9 --------- samples/gpu/CMakeLists.txt | 2 +- samples/gpu/bgfg_segm.cpp | 2 +- samples/gpu/performance/tests.cpp | 2 +- 27 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 modules/cudabgsegm/CMakeLists.txt rename modules/{gpubgsegm => cudabgsegm}/doc/background_segmentation.rst (100%) rename modules/{gpubgsegm/doc/gpubgsegm.rst => cudabgsegm/doc/cudabgsegm.rst} (100%) rename modules/{gpubgsegm/include/opencv2/gpubgsegm.hpp => cudabgsegm/include/opencv2/cudabgsegm.hpp} (97%) rename modules/{gpubgsegm => cudabgsegm}/perf/perf_bgsegm.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/perf/perf_main.cpp (98%) rename modules/{gpubgsegm => cudabgsegm}/perf/perf_precomp.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/perf/perf_precomp.hpp (98%) rename modules/{gpubgsegm => cudabgsegm}/src/cuda/fgd.cu (100%) rename modules/{gpubgsegm => cudabgsegm}/src/cuda/fgd.hpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/cuda/gmg.cu (100%) rename modules/{gpubgsegm => cudabgsegm}/src/cuda/mog.cu (100%) rename modules/{gpubgsegm => cudabgsegm}/src/cuda/mog2.cu (100%) rename modules/{gpubgsegm => cudabgsegm}/src/fgd.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/gmg.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/mog.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/mog2.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/precomp.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/src/precomp.hpp (98%) rename modules/{gpubgsegm => cudabgsegm}/test/test_bgsegm.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/test/test_main.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/test/test_precomp.cpp (100%) rename modules/{gpubgsegm => cudabgsegm}/test/test_precomp.hpp (98%) delete mode 100644 modules/gpubgsegm/CMakeLists.txt diff --git a/modules/cudabgsegm/CMakeLists.txt b/modules/cudabgsegm/CMakeLists.txt new file mode 100644 index 0000000000..fbfd2ae498 --- /dev/null +++ b/modules/cudabgsegm/CMakeLists.txt @@ -0,0 +1,9 @@ +if(ANDROID OR IOS) + ocv_module_disable(cudabgsegm) +endif() + +set(the_description "CUDA-accelerated Background Segmentation") + +ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) + +ocv_define_module(cudabgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc) diff --git a/modules/gpubgsegm/doc/background_segmentation.rst b/modules/cudabgsegm/doc/background_segmentation.rst similarity index 100% rename from modules/gpubgsegm/doc/background_segmentation.rst rename to modules/cudabgsegm/doc/background_segmentation.rst diff --git a/modules/gpubgsegm/doc/gpubgsegm.rst b/modules/cudabgsegm/doc/cudabgsegm.rst similarity index 100% rename from modules/gpubgsegm/doc/gpubgsegm.rst rename to modules/cudabgsegm/doc/cudabgsegm.rst diff --git a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp b/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp similarity index 97% rename from modules/gpubgsegm/include/opencv2/gpubgsegm.hpp rename to modules/cudabgsegm/include/opencv2/cudabgsegm.hpp index 703eedd120..39e85eb1d5 100644 --- a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp +++ b/modules/cudabgsegm/include/opencv2/cudabgsegm.hpp @@ -40,11 +40,11 @@ // //M*/ -#ifndef __OPENCV_GPUBGSEGM_HPP__ -#define __OPENCV_GPUBGSEGM_HPP__ +#ifndef __OPENCV_CUDABGSEGM_HPP__ +#define __OPENCV_CUDABGSEGM_HPP__ #ifndef __cplusplus -# error gpubgsegm.hpp header must be compiled as C++ +# error cudabgsegm.hpp header must be compiled as C++ #endif #include "opencv2/core/cuda.hpp" @@ -149,4 +149,4 @@ CV_EXPORTS Ptr }} // namespace cv { namespace cuda { -#endif /* __OPENCV_GPUBGSEGM_HPP__ */ +#endif /* __OPENCV_CUDABGSEGM_HPP__ */ diff --git a/modules/gpubgsegm/perf/perf_bgsegm.cpp b/modules/cudabgsegm/perf/perf_bgsegm.cpp similarity index 100% rename from modules/gpubgsegm/perf/perf_bgsegm.cpp rename to modules/cudabgsegm/perf/perf_bgsegm.cpp diff --git a/modules/gpubgsegm/perf/perf_main.cpp b/modules/cudabgsegm/perf/perf_main.cpp similarity index 98% rename from modules/gpubgsegm/perf/perf_main.cpp rename to modules/cudabgsegm/perf/perf_main.cpp index f69d0ea8fd..e85365d03d 100644 --- a/modules/gpubgsegm/perf/perf_main.cpp +++ b/modules/cudabgsegm/perf/perf_main.cpp @@ -44,4 +44,4 @@ using namespace perf; -CV_PERF_TEST_CUDA_MAIN(gpubgsegm) +CV_PERF_TEST_CUDA_MAIN(cudabgsegm) diff --git a/modules/gpubgsegm/perf/perf_precomp.cpp b/modules/cudabgsegm/perf/perf_precomp.cpp similarity index 100% rename from modules/gpubgsegm/perf/perf_precomp.cpp rename to modules/cudabgsegm/perf/perf_precomp.cpp diff --git a/modules/gpubgsegm/perf/perf_precomp.hpp b/modules/cudabgsegm/perf/perf_precomp.hpp similarity index 98% rename from modules/gpubgsegm/perf/perf_precomp.hpp rename to modules/cudabgsegm/perf/perf_precomp.hpp index 83d0fd4f0f..74604dae9b 100644 --- a/modules/gpubgsegm/perf/perf_precomp.hpp +++ b/modules/cudabgsegm/perf/perf_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" -#include "opencv2/gpubgsegm.hpp" +#include "opencv2/cudabgsegm.hpp" #include "opencv2/video.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpubgsegm/src/cuda/fgd.cu b/modules/cudabgsegm/src/cuda/fgd.cu similarity index 100% rename from modules/gpubgsegm/src/cuda/fgd.cu rename to modules/cudabgsegm/src/cuda/fgd.cu diff --git a/modules/gpubgsegm/src/cuda/fgd.hpp b/modules/cudabgsegm/src/cuda/fgd.hpp similarity index 100% rename from modules/gpubgsegm/src/cuda/fgd.hpp rename to modules/cudabgsegm/src/cuda/fgd.hpp diff --git a/modules/gpubgsegm/src/cuda/gmg.cu b/modules/cudabgsegm/src/cuda/gmg.cu similarity index 100% rename from modules/gpubgsegm/src/cuda/gmg.cu rename to modules/cudabgsegm/src/cuda/gmg.cu diff --git a/modules/gpubgsegm/src/cuda/mog.cu b/modules/cudabgsegm/src/cuda/mog.cu similarity index 100% rename from modules/gpubgsegm/src/cuda/mog.cu rename to modules/cudabgsegm/src/cuda/mog.cu diff --git a/modules/gpubgsegm/src/cuda/mog2.cu b/modules/cudabgsegm/src/cuda/mog2.cu similarity index 100% rename from modules/gpubgsegm/src/cuda/mog2.cu rename to modules/cudabgsegm/src/cuda/mog2.cu diff --git a/modules/gpubgsegm/src/fgd.cpp b/modules/cudabgsegm/src/fgd.cpp similarity index 100% rename from modules/gpubgsegm/src/fgd.cpp rename to modules/cudabgsegm/src/fgd.cpp diff --git a/modules/gpubgsegm/src/gmg.cpp b/modules/cudabgsegm/src/gmg.cpp similarity index 100% rename from modules/gpubgsegm/src/gmg.cpp rename to modules/cudabgsegm/src/gmg.cpp diff --git a/modules/gpubgsegm/src/mog.cpp b/modules/cudabgsegm/src/mog.cpp similarity index 100% rename from modules/gpubgsegm/src/mog.cpp rename to modules/cudabgsegm/src/mog.cpp diff --git a/modules/gpubgsegm/src/mog2.cpp b/modules/cudabgsegm/src/mog2.cpp similarity index 100% rename from modules/gpubgsegm/src/mog2.cpp rename to modules/cudabgsegm/src/mog2.cpp diff --git a/modules/gpubgsegm/src/precomp.cpp b/modules/cudabgsegm/src/precomp.cpp similarity index 100% rename from modules/gpubgsegm/src/precomp.cpp rename to modules/cudabgsegm/src/precomp.cpp diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/cudabgsegm/src/precomp.hpp similarity index 98% rename from modules/gpubgsegm/src/precomp.hpp rename to modules/cudabgsegm/src/precomp.hpp index 469f543b83..4b1ae8d96f 100644 --- a/modules/gpubgsegm/src/precomp.hpp +++ b/modules/cudabgsegm/src/precomp.hpp @@ -45,7 +45,7 @@ #include -#include "opencv2/gpubgsegm.hpp" +#include "opencv2/cudabgsegm.hpp" #include "opencv2/core/private.cuda.hpp" diff --git a/modules/gpubgsegm/test/test_bgsegm.cpp b/modules/cudabgsegm/test/test_bgsegm.cpp similarity index 100% rename from modules/gpubgsegm/test/test_bgsegm.cpp rename to modules/cudabgsegm/test/test_bgsegm.cpp diff --git a/modules/gpubgsegm/test/test_main.cpp b/modules/cudabgsegm/test/test_main.cpp similarity index 100% rename from modules/gpubgsegm/test/test_main.cpp rename to modules/cudabgsegm/test/test_main.cpp diff --git a/modules/gpubgsegm/test/test_precomp.cpp b/modules/cudabgsegm/test/test_precomp.cpp similarity index 100% rename from modules/gpubgsegm/test/test_precomp.cpp rename to modules/cudabgsegm/test/test_precomp.cpp diff --git a/modules/gpubgsegm/test/test_precomp.hpp b/modules/cudabgsegm/test/test_precomp.hpp similarity index 98% rename from modules/gpubgsegm/test/test_precomp.hpp rename to modules/cudabgsegm/test/test_precomp.hpp index 783e9e64cd..cdef294858 100644 --- a/modules/gpubgsegm/test/test_precomp.hpp +++ b/modules/cudabgsegm/test/test_precomp.hpp @@ -56,7 +56,7 @@ #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_test.hpp" -#include "opencv2/gpubgsegm.hpp" +#include "opencv2/cudabgsegm.hpp" #include "opencv2/video.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/gpubgsegm/CMakeLists.txt b/modules/gpubgsegm/CMakeLists.txt deleted file mode 100644 index 329bf141d7..0000000000 --- a/modules/gpubgsegm/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -if(ANDROID OR IOS) - ocv_module_disable(gpubgsegm) -endif() - -set(the_description "GPU-accelerated Background Segmentation") - -ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations) - -ocv_define_module(gpubgsegm opencv_video OPTIONAL opencv_legacy opencv_imgproc opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc) diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index c74531b4d9..bb8efd7d97 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -3,7 +3,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope opencv_calib3d opencv_legacy opencv_contrib opencv_gpu opencv_nonfree opencv_softcascade opencv_superres opencv_cudaarithm opencv_cudafilters opencv_cudawarping opencv_cudaimgproc - opencv_cudafeatures2d opencv_cudaoptflow opencv_gpubgsegm + opencv_cudafeatures2d opencv_cudaoptflow opencv_cudabgsegm opencv_cudastereo opencv_cudalegacy) ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) diff --git a/samples/gpu/bgfg_segm.cpp b/samples/gpu/bgfg_segm.cpp index 0e06b7f8fb..ac286de921 100644 --- a/samples/gpu/bgfg_segm.cpp +++ b/samples/gpu/bgfg_segm.cpp @@ -3,7 +3,7 @@ #include "opencv2/core.hpp" #include "opencv2/core/utility.hpp" -#include "opencv2/gpubgsegm.hpp" +#include "opencv2/cudabgsegm.hpp" #include "opencv2/video.hpp" #include "opencv2/highgui.hpp" diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index 70f3aaf9f6..80f6b894a8 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -10,7 +10,7 @@ #include "opencv2/cudafeatures2d.hpp" #include "opencv2/cudafilters.hpp" #include "opencv2/cudaoptflow.hpp" -#include "opencv2/gpubgsegm.hpp" +#include "opencv2/cudabgsegm.hpp" #include "opencv2/legacy.hpp" #include "performance.h"