renamed gpulegacy -> cudalegacy

modules/cudalegacy/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(NOT HAVE_CUDA)
+  ocv_module_disable(cudalegacy)
+endif()
+
+set(the_description "CUDA-accelerated Computer Vision (legacy)")
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized)
+
+ocv_define_module(cudalegacy opencv_core OPTIONAL opencv_objdetect)

modules/cudalegacy/include/opencv2/cudalegacy.hpp

@@ -40,13 +40,13 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPULEGACY_HPP__
-#define __OPENCV_GPULEGACY_HPP__
+#ifndef __OPENCV_CUDALEGACY_HPP__
+#define __OPENCV_CUDALEGACY_HPP__
 
-#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpulegacy/NCVPyramid.hpp"
-#include "opencv2/gpulegacy/NCVHaarObjectDetection.hpp"
-#include "opencv2/gpulegacy/NCVBroxOpticalFlow.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NPP_staging.hpp"
+#include "opencv2/cudalegacy/NCVPyramid.hpp"
+#include "opencv2/cudalegacy/NCVHaarObjectDetection.hpp"
+#include "opencv2/cudalegacy/NCVBroxOpticalFlow.hpp"
 
-#endif /* __OPENCV_GPULEGACY_HPP__ */
+#endif /* __OPENCV_CUDALEGACY_HPP__ */

modules/cudalegacy/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp

@@ -60,7 +60,7 @@
 #ifndef _ncv_optical_flow_h_
 #define _ncv_optical_flow_h_
 
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 /// \brief Model and solver parameters
 struct NCVBroxOpticalFlowDescriptor

modules/cudalegacy/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp

@@ -59,7 +59,7 @@
 #ifndef _ncvhaarobjectdetection_hpp_
 #define _ncvhaarobjectdetection_hpp_
 
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 
 //==============================================================================

modules/cudalegacy/include/opencv2/cudalegacy/NCVPyramid.hpp

@@ -45,7 +45,7 @@
 
 #include <memory>
 #include <vector>
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 #include "opencv2/core/cuda/common.hpp"
 
 namespace cv { namespace cuda { namespace device

modules/cudalegacy/include/opencv2/cudalegacy/NPP_staging.hpp

@@ -43,7 +43,7 @@
 #ifndef _npp_staging_hpp_
 #define _npp_staging_hpp_
 
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 
 /**

modules/cudalegacy/include/opencv2/cudalegacy/private.hpp

@@ -41,8 +41,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__
-#define __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__
+#ifndef __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__
+#define __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__
 
 #ifndef __OPENCV_BUILD
 #  error this is a private header which should not be used from outside of the OpenCV library
@@ -51,10 +51,10 @@
 #include "opencv2/core/private.cuda.hpp"
 
 #ifndef HAVE_CUDA
-#  error gpulegacy module requires CUDA
+#  error cudalegacy module requires CUDA
 #endif
 
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 
 namespace cv { namespace cuda
 {
@@ -93,4 +93,4 @@ namespace cv { namespace cuda
     #define ncvSafeCall(expr)  cv::cuda::checkNcvError(expr, __FILE__, __LINE__, "")
 #endif
 
-#endif // __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__
+#endif // __OPENCV_CORE_CUDALEGACY_PRIVATE_HPP__

modules/cudalegacy/src/cuda/NCV.cu

@@ -43,7 +43,7 @@
 #include <iostream>
 #include <vector>
 
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 //===================================================================
 //

modules/cudalegacy/src/cuda/NCVAlg.hpp

@@ -43,7 +43,7 @@
 #ifndef _ncv_alg_hpp_
 #define _ncv_alg_hpp_
 
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 
 template <class T>

modules/cudalegacy/src/cuda/NCVBroxOpticalFlow.cu

@@ -63,8 +63,8 @@
 
 #include "opencv2/core/cuda/utility.hpp"
 
-#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpulegacy/NCVBroxOpticalFlow.hpp"
+#include "opencv2/cudalegacy/NPP_staging.hpp"
+#include "opencv2/cudalegacy/NCVBroxOpticalFlow.hpp"
 
 
 typedef NCVVectorAlloc<Ncv32f> FloatVector;

modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu

@@ -69,9 +69,9 @@
 #  include "opencv2/objdetect/objdetect_c.h"
 #endif
 
-#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpulegacy/NPP_staging.hpp"
-#include "opencv2/gpulegacy/NCVHaarObjectDetection.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NPP_staging.hpp"
+#include "opencv2/cudalegacy/NCVHaarObjectDetection.hpp"
 
 #include "NCVRuntimeTemplates.hpp"
 #include "NCVAlg.hpp"

modules/cudalegacy/src/cuda/NCVPixelOperations.hpp

@@ -45,7 +45,7 @@
 
 #include <limits.h>
 #include <float.h>
-#include "opencv2/gpulegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
 
 template<typename TBase> inline __host__ __device__ TBase _pixMaxVal();
 template<> static inline __host__ __device__ Ncv8u  _pixMaxVal<Ncv8u>()  {return UCHAR_MAX;}

modules/cudalegacy/src/cuda/NCVPyramid.cu

@@ -45,8 +45,8 @@
 
 #include "opencv2/core/cuda/common.hpp"
 
-#include "opencv2/gpulegacy/NCV.hpp"
-#include "opencv2/gpulegacy/NCVPyramid.hpp"
+#include "opencv2/cudalegacy/NCV.hpp"
+#include "opencv2/cudalegacy/NCVPyramid.hpp"
 
 #include "NCVAlg.hpp"
 #include "NCVPixelOperations.hpp"

modules/cudalegacy/src/cuda/NPP_staging.cu

@@ -48,7 +48,7 @@
 #include "opencv2/core/cuda/warp.hpp"
 #include "opencv2/core/cuda/warp_shuffle.hpp"
 
-#include "opencv2/gpulegacy/NPP_staging.hpp"
+#include "opencv2/cudalegacy/NPP_staging.hpp"
 
 
 texture<Ncv8u,  1, cudaReadModeElementType> tex8u;

modules/cudalegacy/src/precomp.hpp

@@ -47,7 +47,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 #include "opencv2/core/utility.hpp"
 
 #include "opencv2/opencv_modules.hpp"
@@ -57,6 +57,6 @@
 #endif
 
 #include "opencv2/core/private.cuda.hpp"
-#include "opencv2/gpulegacy/private.hpp"
+#include "opencv2/cudalegacy/private.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/cudalegacy/test/NCVTest.hpp

@@ -56,7 +56,7 @@
 
 #include <cuda_runtime.h>
 
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 
 
 struct NCVTestReport

modules/cudalegacy/test/NCVTestSourceProvider.hpp

@@ -46,7 +46,7 @@
 #include <memory>
 
 #include "opencv2/highgui.hpp"
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 
 
 template <class T>

modules/cudalegacy/test/test_precomp.hpp

@@ -69,7 +69,7 @@
 #include "opencv2/ts/gpu_test.hpp"
 
 #include "opencv2/core/cuda.hpp"
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 #include "opencv2/highgui.hpp"
 
 #include "opencv2/core/private.cuda.hpp"

modules/gpu/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Computer Vision")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
 
-ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_gpuarithm opencv_gpuwarping OPTIONAL opencv_gpulegacy)
+ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_gpuarithm opencv_gpuwarping OPTIONAL opencv_cudalegacy)

modules/gpu/src/cascadeclassifier.cpp

@@ -73,7 +73,7 @@ public:
     virtual bool read(const String& classifierAsXml) = 0;
 };
 
-#ifndef HAVE_OPENCV_GPULEGACY
+#ifndef HAVE_OPENCV_CUDALEGACY
 
 struct cv::cuda::CascadeClassifier_GPU::HaarCascade : cv::cuda::CascadeClassifier_GPU::CascadeClassifierImpl
 {
@@ -509,7 +509,7 @@ private:
 
             integral.create(frame.height + 1, integralFactor * (frame.width + 1), CV_32SC1);
 
-#ifdef HAVE_OPENCV_GPULEGACY
+#ifdef HAVE_OPENCV_CUDALEGACY
             NcvSize32u roiSize;
             roiSize.width = frame.width;
             roiSize.height = frame.height;

modules/gpu/src/precomp.hpp

@@ -53,8 +53,8 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpulegacy/private.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy/private.hpp"
 #endif
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuarithm/CMakeLists.txt

@@ -6,7 +6,7 @@ set(the_description "GPU-accelerated Operations on Matrices")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
 
-ocv_add_module(gpuarithm opencv_core OPTIONAL opencv_gpulegacy)
+ocv_add_module(gpuarithm opencv_core OPTIONAL opencv_cudalegacy)
 
 ocv_module_include_directories()
 ocv_glob_module_sources()

modules/gpuarithm/src/precomp.hpp

@@ -54,9 +54,9 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpulegacy.hpp"
-#  include "opencv2/gpulegacy/private.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy.hpp"
+#  include "opencv2/cudalegacy/private.hpp"
 #endif
 
 #ifdef HAVE_CUBLAS

modules/gpuarithm/src/reductions.cpp

@@ -790,7 +790,7 @@ void cv::cuda::integral(InputArray _src, OutputArray _dst, GpuMat& buffer, Strea
     }
     else
     {
-    #ifndef HAVE_OPENCV_GPULEGACY
+    #ifndef HAVE_OPENCV_CUDALEGACY
         throw_no_cuda();
     #else
         _dst.create(src.rows + 1, src.cols + 1, CV_32SC1);
@@ -823,7 +823,7 @@ void cv::cuda::integral(InputArray _src, OutputArray _dst, GpuMat& buffer, Strea
 
 void cv::cuda::sqrIntegral(InputArray _src, OutputArray _dst, GpuMat& buf, Stream& _stream)
 {
-#ifndef HAVE_OPENCV_GPULEGACY
+#ifndef HAVE_OPENCV_CUDALEGACY
     (void) _src;
     (void) _dst;
     (void) _stream;

modules/gpulegacy/CMakeLists.txt

@@ -1,9 +0,0 @@
-if(NOT HAVE_CUDA)
-  ocv_module_disable(gpulegacy)
-endif()
-
-set(the_description "GPU-accelerated Computer Vision (legacy)")
-
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized)
-
-ocv_define_module(gpulegacy opencv_core OPTIONAL opencv_objdetect)

modules/gpuoptflow/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Optical Flow")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_gpuarithm opencv_gpuwarping opencv_gpuimgproc OPTIONAL opencv_gpulegacy)
+ocv_define_module(gpuoptflow opencv_video opencv_legacy opencv_gpuarithm opencv_gpuwarping opencv_gpuimgproc OPTIONAL opencv_cudalegacy)

modules/gpuoptflow/src/brox.cpp

@@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;
 
-#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_GPULEGACY) || defined (CUDA_DISABLER)
+#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_CUDALEGACY) || defined (CUDA_DISABLER)
 
 void cv::cuda::BroxOpticalFlow::operator ()(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
 

modules/gpuoptflow/src/interpolate_frames.cpp

@@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;
 
-#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_GPULEGACY) || defined (CUDA_DISABLER)
+#if !defined (HAVE_CUDA) || !defined (HAVE_OPENCV_CUDALEGACY) || defined (CUDA_DISABLER)
 
 void cv::cuda::interpolateFrames(const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, const GpuMat&, float, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
 

modules/gpuoptflow/src/precomp.hpp

@@ -55,8 +55,8 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpulegacy/private.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy/private.hpp"
 #endif
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuwarping/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Image Warping")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
 
-ocv_define_module(gpuwarping opencv_imgproc OPTIONAL opencv_gpulegacy)
+ocv_define_module(gpuwarping opencv_imgproc OPTIONAL opencv_cudalegacy)

modules/gpuwarping/src/precomp.hpp

@@ -49,9 +49,9 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_GPULEGACY
-#  include "opencv2/gpulegacy.hpp"
-#  include "opencv2/gpulegacy/private.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy.hpp"
+#  include "opencv2/cudalegacy/private.hpp"
 #endif
 
 #endif /* __OPENCV_PRECOMP_H__ */

modules/gpuwarping/src/pyramids.cpp

@@ -136,7 +136,7 @@ void cv::cuda::pyrUp(InputArray _src, OutputArray _dst, Stream& stream)
 //////////////////////////////////////////////////////////////////////////////
 // ImagePyramid
 
-#ifdef HAVE_OPENCV_GPULEGACY
+#ifdef HAVE_OPENCV_CUDALEGACY
 
 namespace
 {
@@ -230,7 +230,7 @@ namespace
 
 Ptr<ImagePyramid> cv::cuda::createImagePyramid(InputArray img, int nLayers, Stream& stream)
 {
-#ifndef HAVE_OPENCV_GPULEGACY
+#ifndef HAVE_OPENCV_CUDALEGACY
     (void) img;
     (void) numLayers;
     (void) stream;

samples/gpu/CMakeLists.txt

@@ -4,7 +4,8 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
                                      opencv_nonfree opencv_softcascade opencv_superres
                                      opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc
                                      opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
-                                     opencv_gpustereo opencv_gpulegacy)
+                                     opencv_gpustereo opencv_cudalegacy)
+
 ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
 
 if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
@@ -96,3 +97,4 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32)
           DESTINATION share/OpenCV/samples/${project}
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
+

samples/gpu/cascadeclassifier_nvidia_api.cpp

@@ -7,7 +7,7 @@
 #include <iomanip>
 #include <cstdio>
 #include "opencv2/core/cuda.hpp"
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/objdetect.hpp"

samples/gpu/opticalflow_nvidia_api.cpp

@@ -12,7 +12,7 @@
 #include <iostream>
 #include <iomanip>
 #include "opencv2/core/cuda.hpp"
-#include "opencv2/gpulegacy.hpp"
+#include "opencv2/cudalegacy.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"