Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replaced gpu->cuda in files names

Browse Source
pull/1299/head
Vladislav Vinogradov 12 years ago
parent 80b9fd87dc
commit 3c34b24f1f
46 changed files with 55 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/cuda/perf/perf_precomp.hpp
  2. 2
      modules/cuda/test/test_precomp.hpp
  3. 2
      modules/cudaarithm/perf/perf_precomp.hpp
  4. 2
      modules/cudaarithm/test/test_precomp.hpp
  5. 2
      modules/cudabgsegm/perf/perf_precomp.hpp
  6. 2
      modules/cudabgsegm/test/test_precomp.hpp
  7. 2
      modules/cudacodec/perf/perf_precomp.hpp
  8. 2
      modules/cudacodec/test/test_precomp.hpp
  9. 2
      modules/cudafeatures2d/perf/perf_precomp.hpp
  10. 2
      modules/cudafeatures2d/test/test_precomp.hpp
  11. 2
      modules/cudafilters/perf/perf_precomp.hpp
  12. 2
      modules/cudafilters/test/test_precomp.hpp
  13. 2
      modules/cudaimgproc/perf/perf_precomp.hpp
  14. 2
      modules/cudaimgproc/test/test_precomp.hpp
  15. 2
      modules/cudalegacy/test/test_precomp.hpp
  16. 2
      modules/cudaoptflow/perf/perf_precomp.hpp
  17. 2
      modules/cudaoptflow/test/test_precomp.hpp
  18. 2
      modules/cudastereo/perf/perf_precomp.hpp
  19. 2
      modules/cudastereo/test/test_precomp.hpp
  20. 2
      modules/cudawarping/perf/perf_precomp.hpp
  21. 2
      modules/cudawarping/test/test_precomp.hpp
  22. 2
      modules/cudev/test/test_precomp.hpp
  23. 6
      modules/nonfree/include/opencv2/nonfree/cuda.hpp
  24. 2
      modules/nonfree/perf/perf_main.cpp
  25. 2
      modules/nonfree/perf/perf_precomp.hpp
  26. 2
      modules/nonfree/perf/perf_surf.cuda.cpp
  27. 2
      modules/nonfree/src/precomp.hpp
  28. 0
      modules/nonfree/src/surf.cuda.cpp
  29. 6
      modules/nonfree/test/test_precomp.hpp
  30. 0
      modules/nonfree/test/test_surf.cuda.cpp
  31. 6
      modules/photo/include/opencv2/photo/cuda.hpp
  32. 4
      modules/photo/perf/perf_cuda.cpp
  33. 2
      modules/photo/perf/perf_main.cpp
  34. 2
      modules/photo/src/denoising.cuda.cpp
  35. 4
      modules/photo/test/test_denoising.cuda.cpp
  36. 2
      modules/softcascade/perf/perf_main.cpp
  37. 2
      modules/stitching/include/opencv2/stitching/detail/matchers.hpp
  38. 2
      modules/stitching/src/precomp.hpp
  39. 2
      modules/superres/perf/perf_precomp.hpp
  40. 0
      modules/superres/src/btv_l1_cuda.cpp
  41. 6
      modules/ts/include/opencv2/ts/cuda_perf.hpp
  42. 6
      modules/ts/include/opencv2/ts/cuda_test.hpp
  43. 2
      modules/ts/src/cuda_perf.cpp
  44. 2
      modules/ts/src/cuda_test.cpp
  45. 2
      samples/gpu/performance/tests.cpp
  46. 2
      samples/gpu/surf_keypoint_matcher.cpp

2
modules/cuda/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cuda.hpp" #include "opencv2/cuda.hpp"
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"

2
modules/cuda/test/test_precomp.hpp
Unescape View File

@ -54,7 +54,7 @@
#include <fstream> #include <fstream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cuda.hpp" #include "opencv2/cuda.hpp"
#include "opencv2/core.hpp" #include "opencv2/core.hpp"

2
modules/cudaarithm/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/core.hpp" #include "opencv2/core.hpp"

2
modules/cudaarithm/test/test_precomp.hpp
Unescape View File

@ -54,7 +54,7 @@
#include <functional> #include <functional>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/core.hpp" #include "opencv2/core.hpp"

2
modules/cudabgsegm/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudabgsegm.hpp" #include "opencv2/cudabgsegm.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"

2
modules/cudabgsegm/test/test_precomp.hpp
Unescape View File

@ -54,7 +54,7 @@
#include <fstream> #include <fstream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudabgsegm.hpp" #include "opencv2/cudabgsegm.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"

2
modules/cudacodec/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudacodec.hpp" #include "opencv2/cudacodec.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"

2
modules/cudacodec/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudacodec.hpp" #include "opencv2/cudacodec.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"

2
modules/cudafeatures2d/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudafeatures2d.hpp" #include "opencv2/cudafeatures2d.hpp"
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"

2
modules/cudafeatures2d/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudafeatures2d.hpp" #include "opencv2/cudafeatures2d.hpp"
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"

2
modules/cudafilters/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudafilters.hpp" #include "opencv2/cudafilters.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudafilters/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudafilters.hpp" #include "opencv2/cudafilters.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudaimgproc/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudaimgproc.hpp" #include "opencv2/cudaimgproc.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudaimgproc/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudaimgproc.hpp" #include "opencv2/cudaimgproc.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudalegacy/test/test_precomp.hpp
Unescape View File

@ -66,7 +66,7 @@
#include <fstream> #include <fstream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
#include "opencv2/cudalegacy.hpp" #include "opencv2/cudalegacy.hpp"

2
modules/cudaoptflow/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudaoptflow.hpp" #include "opencv2/cudaoptflow.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"

2
modules/cudaoptflow/test/test_precomp.hpp
Unescape View File

@ -54,7 +54,7 @@
#include <fstream> #include <fstream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudaoptflow.hpp" #include "opencv2/cudaoptflow.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"

2
modules/cudastereo/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudastereo.hpp" #include "opencv2/cudastereo.hpp"
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"

2
modules/cudastereo/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudastereo.hpp" #include "opencv2/cudastereo.hpp"
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"

2
modules/cudawarping/perf/perf_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/cudawarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudawarping/test/test_precomp.hpp
Unescape View File

@ -52,7 +52,7 @@
#define __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/cudawarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"

2
modules/cudev/test/test_precomp.hpp
Unescape View File

@ -50,7 +50,7 @@
#include "opencv2/cudev.hpp" #include "opencv2/cudev.hpp"
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "cvconfig.h" #include "cvconfig.h"

6
modules/nonfree/include/opencv2/nonfree/gpu.hpp → modules/nonfree/include/opencv2/nonfree/cuda.hpp
Unescape View File

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_NONFREE_GPU_HPP__ #ifndef __OPENCV_NONFREE_CUDA_HPP__
#define __OPENCV_NONFREE_GPU_HPP__ #define __OPENCV_NONFREE_CUDA_HPP__
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
@ -123,4 +123,4 @@ public:
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
#endif // __OPENCV_NONFREE_GPU_HPP__ #endif // __OPENCV_NONFREE_CUDA_HPP__

2
modules/nonfree/perf/perf_main.cpp
Unescape View File

@ -1,5 +1,5 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
static const char * impls[] = { static const char * impls[] = {
#ifdef HAVE_CUDA #ifdef HAVE_CUDA

2
modules/nonfree/perf/perf_precomp.hpp
Unescape View File

@ -21,7 +21,7 @@
#endif #endif
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
# include "opencv2/nonfree/gpu.hpp" # include "opencv2/nonfree/cuda.hpp"
#endif #endif
#ifdef GTEST_CREATE_SHARED_LIBRARY #ifdef GTEST_CREATE_SHARED_LIBRARY

2
modules/nonfree/perf/perf_gpu.cpp → modules/nonfree/perf/perf_surf.cuda.cpp
Unescape View File

@ -44,7 +44,7 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
using namespace std; using namespace std;
using namespace testing; using namespace testing;

2
modules/nonfree/src/precomp.hpp
Unescape View File

@ -49,7 +49,7 @@
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/cuda.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

0
modules/nonfree/src/surf_gpu.cpp → modules/nonfree/src/surf.cuda.cpp
Unescape View File

6
modules/nonfree/test/test_precomp.hpp
Unescape View File

@ -11,12 +11,12 @@
#include <iostream> #include <iostream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
#include "opencv2/nonfree.hpp" #include "opencv2/nonfree.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#include "cvconfig.h" #include "cvconfig.h"
@ -26,7 +26,7 @@
#endif #endif
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
# include "opencv2/nonfree/gpu.hpp" # include "opencv2/nonfree/cuda.hpp"
#endif #endif
#endif #endif

0
modules/nonfree/test/test_gpu.cpp → modules/nonfree/test/test_surf.cuda.cpp
Unescape View File

6
modules/photo/include/opencv2/photo/gpu.hpp → modules/photo/include/opencv2/photo/cuda.hpp
Unescape View File

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_PHOTO_GPU_HPP__ #ifndef __OPENCV_PHOTO_CUDA_HPP__
#define __OPENCV_PHOTO_GPU_HPP__ #define __OPENCV_PHOTO_CUDA_HPP__
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
@ -68,4 +68,4 @@ private:
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
#endif /* __OPENCV_PHOTO_GPU_HPP__ */ #endif /* __OPENCV_PHOTO_CUDA_HPP__ */

4
modules/photo/perf/perf_gpu.cpp → modules/photo/perf/perf_cuda.cpp
Unescape View File

@ -42,8 +42,8 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#include "opencv2/photo/gpu.hpp" #include "opencv2/photo/cuda.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

2
modules/photo/perf/perf_main.cpp
Unescape View File

@ -1,5 +1,5 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
static const char * impls[] = { static const char * impls[] = {
#ifdef HAVE_CUDA #ifdef HAVE_CUDA

2
modules/photo/src/denoising_gpu.cpp → modules/photo/src/denoising.cuda.cpp
Unescape View File

@ -42,7 +42,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/photo/gpu.hpp" #include "opencv2/photo/cuda.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"

4
modules/photo/test/test_denoising_gpu.cpp → modules/photo/test/test_denoising.cuda.cpp
Unescape View File

@ -42,8 +42,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "opencv2/photo/gpu.hpp" #include "opencv2/photo/cuda.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#include "cvconfig.h" #include "cvconfig.h"

2
modules/softcascade/perf/perf_main.cpp
Unescape View File

@ -41,7 +41,7 @@
//M*/ //M*/
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
static const char * impls[] = { static const char * impls[] = {
#ifdef HAVE_CUDA #ifdef HAVE_CUDA

2
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
Unescape View File

@ -49,7 +49,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE #ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/gpu.hpp" # include "opencv2/nonfree/cuda.hpp"
#endif #endif
namespace cv { namespace cv {

2
modules/stitching/src/precomp.hpp
Unescape View File

@ -85,7 +85,7 @@
#endif #endif
#ifdef HAVE_OPENCV_NONFREE #ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/gpu.hpp" # include "opencv2/nonfree/cuda.hpp"
#endif #endif
#include "../../imgproc/src/gcgraph.hpp" #include "../../imgproc/src/gcgraph.hpp"

2
modules/superres/perf/perf_precomp.hpp
Unescape View File

@ -54,7 +54,7 @@
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/superres.hpp" #include "opencv2/superres.hpp"
#include "opencv2/superres/optical_flow.hpp" #include "opencv2/superres/optical_flow.hpp"

0
modules/superres/src/btv_l1_gpu.cpp → modules/superres/src/btv_l1_cuda.cpp
Unescape View File

6
modules/ts/include/opencv2/ts/gpu_perf.hpp → modules/ts/include/opencv2/ts/cuda_perf.hpp
Unescape View File

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_GPU_PERF_UTILITY_HPP__ #ifndef __OPENCV_CUDA_PERF_UTILITY_HPP__
#define __OPENCV_GPU_PERF_UTILITY_HPP__ #define __OPENCV_CUDA_PERF_UTILITY_HPP__
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
@ -124,4 +124,4 @@ namespace perf
#endif #endif
} }
#endif // __OPENCV_GPU_PERF_UTILITY_HPP__ #endif // __OPENCV_CUDA_PERF_UTILITY_HPP__

6
modules/ts/include/opencv2/ts/gpu_test.hpp → modules/ts/include/opencv2/ts/cuda_test.hpp
Unescape View File

@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_GPU_TEST_UTILITY_HPP__ #ifndef __OPENCV_CUDA_TEST_UTILITY_HPP__
#define __OPENCV_GPU_TEST_UTILITY_HPP__ #define __OPENCV_CUDA_TEST_UTILITY_HPP__
#include <stdexcept> #include <stdexcept>
#include "cvconfig.h" #include "cvconfig.h"
@ -410,4 +410,4 @@ namespace cv { namespace cuda
#endif // HAVE_CUDA #endif // HAVE_CUDA
#endif // __OPENCV_GPU_TEST_UTILITY_HPP__ #endif // __OPENCV_CUDA_TEST_UTILITY_HPP__

2
modules/ts/src/gpu_perf.cpp → modules/ts/src/cuda_perf.cpp
Unescape View File

@ -41,7 +41,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/cuda_perf.hpp"
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
#ifdef HAVE_CUDA #ifdef HAVE_CUDA

2
modules/ts/src/gpu_test.cpp → modules/ts/src/cuda_test.cpp
Unescape View File

@ -40,7 +40,7 @@
// //
//M*/ //M*/
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/cuda_test.hpp"
#include <stdexcept> #include <stdexcept>
using namespace cv; using namespace cv;

2
samples/gpu/performance/tests.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE #ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/cuda.hpp"
#include "opencv2/nonfree/nonfree.hpp" #include "opencv2/nonfree/nonfree.hpp"
#endif #endif

2
samples/gpu/surf_keypoint_matcher.cpp
Unescape View File

@ -8,7 +8,7 @@
#include "opencv2/features2d/features2d.hpp" #include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/cudafeatures2d.hpp" #include "opencv2/cudafeatures2d.hpp"
#include "opencv2/nonfree/gpu.hpp" #include "opencv2/nonfree/cuda.hpp"
using namespace std; using namespace std;
using namespace cv; using namespace cv;

Write Preview
Loading…
Cancel
Save