From 3c34b24f1fd943c746a52f4cbb6f16c31ed2268b Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 24 Jul 2013 12:01:34 +0400 Subject: [PATCH] replaced gpu->cuda in files names --- modules/cuda/perf/perf_precomp.hpp | 2 +- modules/cuda/test/test_precomp.hpp | 2 +- modules/cudaarithm/perf/perf_precomp.hpp | 2 +- modules/cudaarithm/test/test_precomp.hpp | 2 +- modules/cudabgsegm/perf/perf_precomp.hpp | 2 +- modules/cudabgsegm/test/test_precomp.hpp | 2 +- modules/cudacodec/perf/perf_precomp.hpp | 2 +- modules/cudacodec/test/test_precomp.hpp | 2 +- modules/cudafeatures2d/perf/perf_precomp.hpp | 2 +- modules/cudafeatures2d/test/test_precomp.hpp | 2 +- modules/cudafilters/perf/perf_precomp.hpp | 2 +- modules/cudafilters/test/test_precomp.hpp | 2 +- modules/cudaimgproc/perf/perf_precomp.hpp | 2 +- modules/cudaimgproc/test/test_precomp.hpp | 2 +- modules/cudalegacy/test/test_precomp.hpp | 2 +- modules/cudaoptflow/perf/perf_precomp.hpp | 2 +- modules/cudaoptflow/test/test_precomp.hpp | 2 +- modules/cudastereo/perf/perf_precomp.hpp | 2 +- modules/cudastereo/test/test_precomp.hpp | 2 +- modules/cudawarping/perf/perf_precomp.hpp | 2 +- modules/cudawarping/test/test_precomp.hpp | 2 +- modules/cudev/test/test_precomp.hpp | 2 +- .../nonfree/include/opencv2/nonfree/{gpu.hpp => cuda.hpp} | 6 +++--- modules/nonfree/perf/perf_main.cpp | 2 +- modules/nonfree/perf/perf_precomp.hpp | 2 +- modules/nonfree/perf/{perf_gpu.cpp => perf_surf.cuda.cpp} | 2 +- modules/nonfree/src/precomp.hpp | 2 +- modules/nonfree/src/{surf_gpu.cpp => surf.cuda.cpp} | 0 modules/nonfree/test/test_precomp.hpp | 6 +++--- modules/nonfree/test/{test_gpu.cpp => test_surf.cuda.cpp} | 0 modules/photo/include/opencv2/photo/{gpu.hpp => cuda.hpp} | 6 +++--- modules/photo/perf/{perf_gpu.cpp => perf_cuda.cpp} | 4 ++-- modules/photo/perf/perf_main.cpp | 2 +- modules/photo/src/{denoising_gpu.cpp => denoising.cuda.cpp} | 2 +- .../{test_denoising_gpu.cpp => test_denoising.cuda.cpp} | 4 ++-- modules/softcascade/perf/perf_main.cpp | 2 +- .../stitching/include/opencv2/stitching/detail/matchers.hpp | 2 +- modules/stitching/src/precomp.hpp | 2 +- modules/superres/perf/perf_precomp.hpp | 2 +- modules/superres/src/{btv_l1_gpu.cpp => btv_l1_cuda.cpp} | 0 .../ts/include/opencv2/ts/{gpu_perf.hpp => cuda_perf.hpp} | 6 +++--- .../ts/include/opencv2/ts/{gpu_test.hpp => cuda_test.hpp} | 6 +++--- modules/ts/src/{gpu_perf.cpp => cuda_perf.cpp} | 2 +- modules/ts/src/{gpu_test.cpp => cuda_test.cpp} | 2 +- samples/gpu/performance/tests.cpp | 2 +- samples/gpu/surf_keypoint_matcher.cpp | 2 +- 46 files changed, 55 insertions(+), 55 deletions(-) rename modules/nonfree/include/opencv2/nonfree/{gpu.hpp => cuda.hpp} (97%) rename modules/nonfree/perf/{perf_gpu.cpp => perf_surf.cuda.cpp} (98%) rename modules/nonfree/src/{surf_gpu.cpp => surf.cuda.cpp} (100%) rename modules/nonfree/test/{test_gpu.cpp => test_surf.cuda.cpp} (100%) rename modules/photo/include/opencv2/photo/{gpu.hpp => cuda.hpp} (96%) rename modules/photo/perf/{perf_gpu.cpp => perf_cuda.cpp} (98%) rename modules/photo/src/{denoising_gpu.cpp => denoising.cuda.cpp} (99%) rename modules/photo/test/{test_denoising_gpu.cpp => test_denoising.cuda.cpp} (98%) rename modules/superres/src/{btv_l1_gpu.cpp => btv_l1_cuda.cpp} (100%) rename modules/ts/include/opencv2/ts/{gpu_perf.hpp => cuda_perf.hpp} (97%) rename modules/ts/include/opencv2/ts/{gpu_test.hpp => cuda_test.hpp} (99%) rename modules/ts/src/{gpu_perf.cpp => cuda_perf.cpp} (99%) rename modules/ts/src/{gpu_test.cpp => cuda_test.cpp} (99%) diff --git a/modules/cuda/perf/perf_precomp.hpp b/modules/cuda/perf/perf_precomp.hpp index 37295bb5d6..fbf7d3a191 100644 --- a/modules/cuda/perf/perf_precomp.hpp +++ b/modules/cuda/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cuda.hpp" #include "opencv2/calib3d.hpp" diff --git a/modules/cuda/test/test_precomp.hpp b/modules/cuda/test/test_precomp.hpp index 7808037e8b..a0abfd2285 100644 --- a/modules/cuda/test/test_precomp.hpp +++ b/modules/cuda/test/test_precomp.hpp @@ -54,7 +54,7 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cuda.hpp" #include "opencv2/core.hpp" diff --git a/modules/cudaarithm/perf/perf_precomp.hpp b/modules/cudaarithm/perf/perf_precomp.hpp index fbd70698ca..c2bfcaa8af 100644 --- a/modules/cudaarithm/perf/perf_precomp.hpp +++ b/modules/cudaarithm/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudaarithm.hpp" #include "opencv2/core.hpp" diff --git a/modules/cudaarithm/test/test_precomp.hpp b/modules/cudaarithm/test/test_precomp.hpp index 6bfdd38916..66441e3d3d 100644 --- a/modules/cudaarithm/test/test_precomp.hpp +++ b/modules/cudaarithm/test/test_precomp.hpp @@ -54,7 +54,7 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudaarithm.hpp" #include "opencv2/core.hpp" diff --git a/modules/cudabgsegm/perf/perf_precomp.hpp b/modules/cudabgsegm/perf/perf_precomp.hpp index 74604dae9b..e52fe92a5e 100644 --- a/modules/cudabgsegm/perf/perf_precomp.hpp +++ b/modules/cudabgsegm/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudabgsegm.hpp" #include "opencv2/video.hpp" diff --git a/modules/cudabgsegm/test/test_precomp.hpp b/modules/cudabgsegm/test/test_precomp.hpp index cdef294858..4d21dfc7ae 100644 --- a/modules/cudabgsegm/test/test_precomp.hpp +++ b/modules/cudabgsegm/test/test_precomp.hpp @@ -54,7 +54,7 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudabgsegm.hpp" #include "opencv2/video.hpp" diff --git a/modules/cudacodec/perf/perf_precomp.hpp b/modules/cudacodec/perf/perf_precomp.hpp index a431af5c61..593c84d555 100644 --- a/modules/cudacodec/perf/perf_precomp.hpp +++ b/modules/cudacodec/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudacodec.hpp" #include "opencv2/highgui.hpp" diff --git a/modules/cudacodec/test/test_precomp.hpp b/modules/cudacodec/test/test_precomp.hpp index 38d3bef548..5c5a1422e2 100644 --- a/modules/cudacodec/test/test_precomp.hpp +++ b/modules/cudacodec/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudacodec.hpp" #include "opencv2/highgui.hpp" diff --git a/modules/cudafeatures2d/perf/perf_precomp.hpp b/modules/cudafeatures2d/perf/perf_precomp.hpp index 1ec469013b..a27cca9962 100644 --- a/modules/cudafeatures2d/perf/perf_precomp.hpp +++ b/modules/cudafeatures2d/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudafeatures2d.hpp" #include "opencv2/features2d.hpp" diff --git a/modules/cudafeatures2d/test/test_precomp.hpp b/modules/cudafeatures2d/test/test_precomp.hpp index 4063b8feab..bb2ca85cd7 100644 --- a/modules/cudafeatures2d/test/test_precomp.hpp +++ b/modules/cudafeatures2d/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudafeatures2d.hpp" #include "opencv2/features2d.hpp" diff --git a/modules/cudafilters/perf/perf_precomp.hpp b/modules/cudafilters/perf/perf_precomp.hpp index 1cfe487cee..3a7473de62 100644 --- a/modules/cudafilters/perf/perf_precomp.hpp +++ b/modules/cudafilters/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudafilters.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudafilters/test/test_precomp.hpp b/modules/cudafilters/test/test_precomp.hpp index 1cd9d1dde2..eb7212704c 100644 --- a/modules/cudafilters/test/test_precomp.hpp +++ b/modules/cudafilters/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudafilters.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudaimgproc/perf/perf_precomp.hpp b/modules/cudaimgproc/perf/perf_precomp.hpp index 1aa6f8f565..a8037a3a5d 100644 --- a/modules/cudaimgproc/perf/perf_precomp.hpp +++ b/modules/cudaimgproc/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudaimgproc.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudaimgproc/test/test_precomp.hpp b/modules/cudaimgproc/test/test_precomp.hpp index a1acbd3524..27113f8b36 100644 --- a/modules/cudaimgproc/test/test_precomp.hpp +++ b/modules/cudaimgproc/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudaimgproc.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudalegacy/test/test_precomp.hpp b/modules/cudalegacy/test/test_precomp.hpp index fbc25b7211..5169ef2bbd 100644 --- a/modules/cudalegacy/test/test_precomp.hpp +++ b/modules/cudalegacy/test/test_precomp.hpp @@ -66,7 +66,7 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/core/cuda.hpp" #include "opencv2/cudalegacy.hpp" diff --git a/modules/cudaoptflow/perf/perf_precomp.hpp b/modules/cudaoptflow/perf/perf_precomp.hpp index 9c70c196e4..1dc00ae4b7 100644 --- a/modules/cudaoptflow/perf/perf_precomp.hpp +++ b/modules/cudaoptflow/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudaoptflow.hpp" #include "opencv2/video.hpp" diff --git a/modules/cudaoptflow/test/test_precomp.hpp b/modules/cudaoptflow/test/test_precomp.hpp index db9f1446ee..54812022a6 100644 --- a/modules/cudaoptflow/test/test_precomp.hpp +++ b/modules/cudaoptflow/test/test_precomp.hpp @@ -54,7 +54,7 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudaoptflow.hpp" #include "opencv2/video.hpp" diff --git a/modules/cudastereo/perf/perf_precomp.hpp b/modules/cudastereo/perf/perf_precomp.hpp index 3f51e3c21b..89d2aca4b9 100644 --- a/modules/cudastereo/perf/perf_precomp.hpp +++ b/modules/cudastereo/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudastereo.hpp" #include "opencv2/calib3d.hpp" diff --git a/modules/cudastereo/test/test_precomp.hpp b/modules/cudastereo/test/test_precomp.hpp index 4a629f3289..e93ca3ecda 100644 --- a/modules/cudastereo/test/test_precomp.hpp +++ b/modules/cudastereo/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudastereo.hpp" #include "opencv2/calib3d.hpp" diff --git a/modules/cudawarping/perf/perf_precomp.hpp b/modules/cudawarping/perf/perf_precomp.hpp index 4997084760..7de57bf9bc 100644 --- a/modules/cudawarping/perf/perf_precomp.hpp +++ b/modules/cudawarping/perf/perf_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_PERF_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/cudawarping.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudawarping/test/test_precomp.hpp b/modules/cudawarping/test/test_precomp.hpp index c4d2c13e6e..7aac2f0753 100644 --- a/modules/cudawarping/test/test_precomp.hpp +++ b/modules/cudawarping/test/test_precomp.hpp @@ -52,7 +52,7 @@ #define __OPENCV_TEST_PRECOMP_HPP__ #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/cudawarping.hpp" #include "opencv2/imgproc.hpp" diff --git a/modules/cudev/test/test_precomp.hpp b/modules/cudev/test/test_precomp.hpp index 18e7cc1ce2..a3e28b1246 100644 --- a/modules/cudev/test/test_precomp.hpp +++ b/modules/cudev/test/test_precomp.hpp @@ -50,7 +50,7 @@ #include "opencv2/cudev.hpp" #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "cvconfig.h" diff --git a/modules/nonfree/include/opencv2/nonfree/gpu.hpp b/modules/nonfree/include/opencv2/nonfree/cuda.hpp similarity index 97% rename from modules/nonfree/include/opencv2/nonfree/gpu.hpp rename to modules/nonfree/include/opencv2/nonfree/cuda.hpp index 3853632bc1..7fae9cd691 100644 --- a/modules/nonfree/include/opencv2/nonfree/gpu.hpp +++ b/modules/nonfree/include/opencv2/nonfree/cuda.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_NONFREE_GPU_HPP__ -#define __OPENCV_NONFREE_GPU_HPP__ +#ifndef __OPENCV_NONFREE_CUDA_HPP__ +#define __OPENCV_NONFREE_CUDA_HPP__ #include "opencv2/core/cuda.hpp" @@ -123,4 +123,4 @@ public: }} // namespace cv { namespace cuda { -#endif // __OPENCV_NONFREE_GPU_HPP__ +#endif // __OPENCV_NONFREE_CUDA_HPP__ diff --git a/modules/nonfree/perf/perf_main.cpp b/modules/nonfree/perf/perf_main.cpp index d5f4a1a512..a5a76af55b 100644 --- a/modules/nonfree/perf/perf_main.cpp +++ b/modules/nonfree/perf/perf_main.cpp @@ -1,5 +1,5 @@ #include "perf_precomp.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" static const char * impls[] = { #ifdef HAVE_CUDA diff --git a/modules/nonfree/perf/perf_precomp.hpp b/modules/nonfree/perf/perf_precomp.hpp index e8fad3b7be..240bb65a7a 100644 --- a/modules/nonfree/perf/perf_precomp.hpp +++ b/modules/nonfree/perf/perf_precomp.hpp @@ -21,7 +21,7 @@ #endif #ifdef HAVE_CUDA -# include "opencv2/nonfree/gpu.hpp" +# include "opencv2/nonfree/cuda.hpp" #endif #ifdef GTEST_CREATE_SHARED_LIBRARY diff --git a/modules/nonfree/perf/perf_gpu.cpp b/modules/nonfree/perf/perf_surf.cuda.cpp similarity index 98% rename from modules/nonfree/perf/perf_gpu.cpp rename to modules/nonfree/perf/perf_surf.cuda.cpp index 348c80e523..13b0c18392 100644 --- a/modules/nonfree/perf/perf_gpu.cpp +++ b/modules/nonfree/perf/perf_surf.cuda.cpp @@ -44,7 +44,7 @@ #ifdef HAVE_CUDA -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" using namespace std; using namespace testing; diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp index fc21fb6864..1aeb1df434 100644 --- a/modules/nonfree/src/precomp.hpp +++ b/modules/nonfree/src/precomp.hpp @@ -49,7 +49,7 @@ #include "opencv2/core/utility.hpp" #include "opencv2/core/private.hpp" -#include "opencv2/nonfree/gpu.hpp" +#include "opencv2/nonfree/cuda.hpp" #include "opencv2/core/private.cuda.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/nonfree/src/surf_gpu.cpp b/modules/nonfree/src/surf.cuda.cpp similarity index 100% rename from modules/nonfree/src/surf_gpu.cpp rename to modules/nonfree/src/surf.cuda.cpp diff --git a/modules/nonfree/test/test_precomp.hpp b/modules/nonfree/test/test_precomp.hpp index 965e651e56..ba289b17c4 100644 --- a/modules/nonfree/test/test_precomp.hpp +++ b/modules/nonfree/test/test_precomp.hpp @@ -11,12 +11,12 @@ #include #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/imgproc.hpp" #include "opencv2/highgui.hpp" #include "opencv2/nonfree.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/opencv_modules.hpp" #include "cvconfig.h" @@ -26,7 +26,7 @@ #endif #ifdef HAVE_CUDA -# include "opencv2/nonfree/gpu.hpp" +# include "opencv2/nonfree/cuda.hpp" #endif #endif diff --git a/modules/nonfree/test/test_gpu.cpp b/modules/nonfree/test/test_surf.cuda.cpp similarity index 100% rename from modules/nonfree/test/test_gpu.cpp rename to modules/nonfree/test/test_surf.cuda.cpp diff --git a/modules/photo/include/opencv2/photo/gpu.hpp b/modules/photo/include/opencv2/photo/cuda.hpp similarity index 96% rename from modules/photo/include/opencv2/photo/gpu.hpp rename to modules/photo/include/opencv2/photo/cuda.hpp index 942eca74fb..c26a041761 100644 --- a/modules/photo/include/opencv2/photo/gpu.hpp +++ b/modules/photo/include/opencv2/photo/cuda.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_PHOTO_GPU_HPP__ -#define __OPENCV_PHOTO_GPU_HPP__ +#ifndef __OPENCV_PHOTO_CUDA_HPP__ +#define __OPENCV_PHOTO_CUDA_HPP__ #include "opencv2/core/cuda.hpp" @@ -68,4 +68,4 @@ private: }} // namespace cv { namespace cuda { -#endif /* __OPENCV_PHOTO_GPU_HPP__ */ +#endif /* __OPENCV_PHOTO_CUDA_HPP__ */ diff --git a/modules/photo/perf/perf_gpu.cpp b/modules/photo/perf/perf_cuda.cpp similarity index 98% rename from modules/photo/perf/perf_gpu.cpp rename to modules/photo/perf/perf_cuda.cpp index db446785df..f3fe099193 100644 --- a/modules/photo/perf/perf_gpu.cpp +++ b/modules/photo/perf/perf_cuda.cpp @@ -42,8 +42,8 @@ #include "perf_precomp.hpp" -#include "opencv2/photo/gpu.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/photo/cuda.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/photo/perf/perf_main.cpp b/modules/photo/perf/perf_main.cpp index fd37812126..9bbb8392a1 100644 --- a/modules/photo/perf/perf_main.cpp +++ b/modules/photo/perf/perf_main.cpp @@ -1,5 +1,5 @@ #include "perf_precomp.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" static const char * impls[] = { #ifdef HAVE_CUDA diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising.cuda.cpp similarity index 99% rename from modules/photo/src/denoising_gpu.cpp rename to modules/photo/src/denoising.cuda.cpp index 2d6406a0eb..76b870fe58 100644 --- a/modules/photo/src/denoising_gpu.cpp +++ b/modules/photo/src/denoising.cuda.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" -#include "opencv2/photo/gpu.hpp" +#include "opencv2/photo/cuda.hpp" #include "opencv2/core/private.cuda.hpp" #include "opencv2/opencv_modules.hpp" diff --git a/modules/photo/test/test_denoising_gpu.cpp b/modules/photo/test/test_denoising.cuda.cpp similarity index 98% rename from modules/photo/test/test_denoising_gpu.cpp rename to modules/photo/test/test_denoising.cuda.cpp index b5f025dd52..054f8260bb 100644 --- a/modules/photo/test/test_denoising_gpu.cpp +++ b/modules/photo/test/test_denoising.cuda.cpp @@ -42,8 +42,8 @@ #include "test_precomp.hpp" -#include "opencv2/photo/gpu.hpp" -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/photo/cuda.hpp" +#include "opencv2/ts/cuda_test.hpp" #include "opencv2/opencv_modules.hpp" #include "cvconfig.h" diff --git a/modules/softcascade/perf/perf_main.cpp b/modules/softcascade/perf/perf_main.cpp index 9a3869f5ef..7a259b2b1d 100644 --- a/modules/softcascade/perf/perf_main.cpp +++ b/modules/softcascade/perf/perf_main.cpp @@ -41,7 +41,7 @@ //M*/ #include "perf_precomp.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" static const char * impls[] = { #ifdef HAVE_CUDA diff --git a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp index d1022e93e0..9a02852738 100644 --- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp @@ -49,7 +49,7 @@ #include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_NONFREE -# include "opencv2/nonfree/gpu.hpp" +# include "opencv2/nonfree/cuda.hpp" #endif namespace cv { diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp index 0eac72c73b..04445176e0 100644 --- a/modules/stitching/src/precomp.hpp +++ b/modules/stitching/src/precomp.hpp @@ -85,7 +85,7 @@ #endif #ifdef HAVE_OPENCV_NONFREE -# include "opencv2/nonfree/gpu.hpp" +# include "opencv2/nonfree/cuda.hpp" #endif #include "../../imgproc/src/gcgraph.hpp" diff --git a/modules/superres/perf/perf_precomp.hpp b/modules/superres/perf/perf_precomp.hpp index a6899e9d7f..7969daa438 100644 --- a/modules/superres/perf/perf_precomp.hpp +++ b/modules/superres/perf/perf_precomp.hpp @@ -54,7 +54,7 @@ #include "opencv2/core.hpp" #include "opencv2/core/cuda.hpp" #include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/superres.hpp" #include "opencv2/superres/optical_flow.hpp" diff --git a/modules/superres/src/btv_l1_gpu.cpp b/modules/superres/src/btv_l1_cuda.cpp similarity index 100% rename from modules/superres/src/btv_l1_gpu.cpp rename to modules/superres/src/btv_l1_cuda.cpp diff --git a/modules/ts/include/opencv2/ts/gpu_perf.hpp b/modules/ts/include/opencv2/ts/cuda_perf.hpp similarity index 97% rename from modules/ts/include/opencv2/ts/gpu_perf.hpp rename to modules/ts/include/opencv2/ts/cuda_perf.hpp index 8f1ba8abc8..87ee24d865 100644 --- a/modules/ts/include/opencv2/ts/gpu_perf.hpp +++ b/modules/ts/include/opencv2/ts/cuda_perf.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_GPU_PERF_UTILITY_HPP__ -#define __OPENCV_GPU_PERF_UTILITY_HPP__ +#ifndef __OPENCV_CUDA_PERF_UTILITY_HPP__ +#define __OPENCV_CUDA_PERF_UTILITY_HPP__ #include "opencv2/core.hpp" #include "opencv2/highgui.hpp" @@ -124,4 +124,4 @@ namespace perf #endif } -#endif // __OPENCV_GPU_PERF_UTILITY_HPP__ +#endif // __OPENCV_CUDA_PERF_UTILITY_HPP__ diff --git a/modules/ts/include/opencv2/ts/gpu_test.hpp b/modules/ts/include/opencv2/ts/cuda_test.hpp similarity index 99% rename from modules/ts/include/opencv2/ts/gpu_test.hpp rename to modules/ts/include/opencv2/ts/cuda_test.hpp index 4ee28582d3..39b8fde606 100644 --- a/modules/ts/include/opencv2/ts/gpu_test.hpp +++ b/modules/ts/include/opencv2/ts/cuda_test.hpp @@ -40,8 +40,8 @@ // //M*/ -#ifndef __OPENCV_GPU_TEST_UTILITY_HPP__ -#define __OPENCV_GPU_TEST_UTILITY_HPP__ +#ifndef __OPENCV_CUDA_TEST_UTILITY_HPP__ +#define __OPENCV_CUDA_TEST_UTILITY_HPP__ #include #include "cvconfig.h" @@ -410,4 +410,4 @@ namespace cv { namespace cuda #endif // HAVE_CUDA -#endif // __OPENCV_GPU_TEST_UTILITY_HPP__ +#endif // __OPENCV_CUDA_TEST_UTILITY_HPP__ diff --git a/modules/ts/src/gpu_perf.cpp b/modules/ts/src/cuda_perf.cpp similarity index 99% rename from modules/ts/src/gpu_perf.cpp rename to modules/ts/src/cuda_perf.cpp index dbd01dcb1f..fa0a6a5ca2 100644 --- a/modules/ts/src/gpu_perf.cpp +++ b/modules/ts/src/cuda_perf.cpp @@ -41,7 +41,7 @@ //M*/ #include "precomp.hpp" -#include "opencv2/ts/gpu_perf.hpp" +#include "opencv2/ts/cuda_perf.hpp" #include "opencv2/core/cuda.hpp" #ifdef HAVE_CUDA diff --git a/modules/ts/src/gpu_test.cpp b/modules/ts/src/cuda_test.cpp similarity index 99% rename from modules/ts/src/gpu_test.cpp rename to modules/ts/src/cuda_test.cpp index 9a7796629b..a2fdde1ffb 100644 --- a/modules/ts/src/gpu_test.cpp +++ b/modules/ts/src/cuda_test.cpp @@ -40,7 +40,7 @@ // //M*/ -#include "opencv2/ts/gpu_test.hpp" +#include "opencv2/ts/cuda_test.hpp" #include using namespace cv; diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index 2c6d114687..c963f1986c 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -18,7 +18,7 @@ #include "opencv2/opencv_modules.hpp" #ifdef HAVE_OPENCV_NONFREE -#include "opencv2/nonfree/gpu.hpp" +#include "opencv2/nonfree/cuda.hpp" #include "opencv2/nonfree/nonfree.hpp" #endif diff --git a/samples/gpu/surf_keypoint_matcher.cpp b/samples/gpu/surf_keypoint_matcher.cpp index 5e68b3fbd7..f9fba1413e 100644 --- a/samples/gpu/surf_keypoint_matcher.cpp +++ b/samples/gpu/surf_keypoint_matcher.cpp @@ -8,7 +8,7 @@ #include "opencv2/features2d/features2d.hpp" #include "opencv2/highgui/highgui.hpp" #include "opencv2/cudafeatures2d.hpp" -#include "opencv2/nonfree/gpu.hpp" +#include "opencv2/nonfree/cuda.hpp" using namespace std; using namespace cv;