generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed gpuwarping -> cudawarping

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-07-23 15:57:59 +04:00
parent dcd600cc47
commit d4901a99ea
52 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/cudawarping/CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
if(ANDROID OR IOS)
ocv_module_disable(cudawarping)
endif()
set(the_description "CUDA-accelerated Image Warping")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations)
ocv_define_module(cudawarping opencv_imgproc OPTIONAL opencv_cudalegacy)

0
modules/gpuwarping/doc/gpuwarping.rst → modules/cudawarping/doc/cudawarping.rst
View File

0
modules/gpuwarping/doc/warping.rst → modules/cudawarping/doc/warping.rst
View File

8
modules/gpuwarping/include/opencv2/gpuwarping.hpp → modules/cudawarping/include/opencv2/cudawarping.hpp
View File

@ -40,11 +40,11 @@
// //
//M*/ //M*/
#ifndef __OPENCV_GPUWARPING_HPP__ #ifndef __OPENCV_CUDAWARPING_HPP__
#define __OPENCV_GPUWARPING_HPP__ #define __OPENCV_CUDAWARPING_HPP__
#ifndef __cplusplus #ifndef __cplusplus
# error gpuwarping.hpp header must be compiled as C++ # error cudawarping.hpp header must be compiled as C++
#endif #endif
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
@ -110,4 +110,4 @@ CV_EXPORTS Ptr<ImagePyramid> createImagePyramid(InputArray img, int nLayers = -1
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
#endif /* __OPENCV_GPUWARPING_HPP__ */ #endif /* __OPENCV_CUDAWARPING_HPP__ */

2
modules/gpuwarping/perf/perf_main.cpp → modules/cudawarping/perf/perf_main.cpp
View File

@ -44,4 +44,4 @@
using namespace perf; using namespace perf;
CV_PERF_TEST_CUDA_MAIN(gpuwarping) CV_PERF_TEST_CUDA_MAIN(cudawarping)

0
modules/gpuwarping/perf/perf_precomp.cpp → modules/cudawarping/perf/perf_precomp.cpp
View File

2
modules/gpuwarping/perf/perf_precomp.hpp → modules/cudawarping/perf/perf_precomp.hpp
View File

@ -54,7 +54,7 @@
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_perf.hpp" #include "opencv2/ts/gpu_perf.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#ifdef GTEST_CREATE_SHARED_LIBRARY #ifdef GTEST_CREATE_SHARED_LIBRARY

0
modules/gpuwarping/perf/perf_warping.cpp → modules/cudawarping/perf/perf_warping.cpp
View File

0
modules/gpuwarping/src/cuda/build_warp_maps.cu → modules/cudawarping/src/cuda/build_warp_maps.cu
View File

0
modules/gpuwarping/src/cuda/pyr_down.cu → modules/cudawarping/src/cuda/pyr_down.cu
View File

0
modules/gpuwarping/src/cuda/pyr_up.cu → modules/cudawarping/src/cuda/pyr_up.cu
View File

0
modules/gpuwarping/src/cuda/remap.cu → modules/cudawarping/src/cuda/remap.cu
View File

0
modules/gpuwarping/src/cuda/resize.cu → modules/cudawarping/src/cuda/resize.cu
View File

0
modules/gpuwarping/src/cuda/warp.cu → modules/cudawarping/src/cuda/warp.cu
View File

0
modules/gpuwarping/src/precomp.cpp → modules/cudawarping/src/precomp.cpp
View File

2
modules/gpuwarping/src/precomp.hpp → modules/cudawarping/src/precomp.hpp
View File

@ -43,7 +43,7 @@
#ifndef __OPENCV_PRECOMP_H__ #ifndef __OPENCV_PRECOMP_H__
#define __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"

0
modules/gpuwarping/src/pyramids.cpp → modules/cudawarping/src/pyramids.cpp
View File

0
modules/gpuwarping/src/remap.cpp → modules/cudawarping/src/remap.cpp
View File

0
modules/gpuwarping/src/resize.cpp → modules/cudawarping/src/resize.cpp
View File

0
modules/gpuwarping/src/warp.cpp → modules/cudawarping/src/warp.cpp
View File

0
modules/gpuwarping/test/interpolation.hpp → modules/cudawarping/test/interpolation.hpp
View File

0
modules/gpuwarping/test/test_main.cpp → modules/cudawarping/test/test_main.cpp
View File

0
modules/gpuwarping/test/test_precomp.cpp → modules/cudawarping/test/test_precomp.cpp
View File

2
modules/gpuwarping/test/test_precomp.hpp → modules/cudawarping/test/test_precomp.hpp
View File

@ -54,7 +54,7 @@
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
#include "opencv2/ts/gpu_test.hpp" #include "opencv2/ts/gpu_test.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
#include "cvconfig.h" #include "cvconfig.h"

0
modules/gpuwarping/test/test_pyramids.cpp → modules/cudawarping/test/test_pyramids.cpp
View File

0
modules/gpuwarping/test/test_remap.cpp → modules/cudawarping/test/test_remap.cpp
View File

0
modules/gpuwarping/test/test_resize.cpp → modules/cudawarping/test/test_resize.cpp
View File

0
modules/gpuwarping/test/test_warp_affine.cpp → modules/cudawarping/test/test_warp_affine.cpp
View File

0
modules/gpuwarping/test/test_warp_perspective.cpp → modules/cudawarping/test/test_warp_perspective.cpp
View File

2
modules/gpu/CMakeLists.txt
View File

@ -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_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_cudaarithm opencv_gpuwarping OPTIONAL opencv_cudalegacy) ocv_define_module(gpu opencv_calib3d opencv_objdetect opencv_cudaarithm opencv_cudawarping OPTIONAL opencv_cudalegacy)

2
modules/gpu/src/precomp.hpp
View File

@ -45,7 +45,7 @@
#include "opencv2/gpu.hpp" #include "opencv2/gpu.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/calib3d.hpp" #include "opencv2/calib3d.hpp"
#include "opencv2/objdetect.hpp" #include "opencv2/objdetect.hpp"

2
modules/gpufeatures2d/CMakeLists.txt
View File

@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Feature Detection and Description")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter)
ocv_define_module(gpufeatures2d opencv_features2d opencv_gpufilters opencv_gpuwarping) ocv_define_module(gpufeatures2d opencv_features2d opencv_gpufilters opencv_cudawarping)

2
modules/gpufeatures2d/src/precomp.hpp
View File

@ -49,7 +49,7 @@
#include "opencv2/gpufeatures2d.hpp" #include "opencv2/gpufeatures2d.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"

2
modules/gpuoptflow/CMakeLists.txt
View File

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

2
modules/gpuoptflow/src/precomp.hpp
View File

@ -47,7 +47,7 @@
#include "opencv2/gpuoptflow.hpp" #include "opencv2/gpuoptflow.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/gpuimgproc.hpp" #include "opencv2/gpuimgproc.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"

9
modules/gpuwarping/CMakeLists.txt
View File

@ -1,9 +0,0 @@
if(ANDROID OR IOS)
ocv_module_disable(gpuwarping)
endif()
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_cudalegacy)

2
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
View File

@ -327,7 +327,7 @@ public:
}; };
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
class CV_EXPORTS PlaneWarperGpu : public PlaneWarper class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
{ {
public: public:

2
modules/stitching/include/opencv2/stitching/warpers.hpp
View File

@ -145,7 +145,7 @@ public:
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
class PlaneWarperGpu: public WarperCreator class PlaneWarperGpu: public WarperCreator
{ {
public: public:

6
modules/stitching/src/blenders.cpp
View File

@ -188,7 +188,7 @@ MultiBandBlender::MultiBandBlender(int try_gpu, int num_bands, int weight_type)
{ {
setNumBands(num_bands); setNumBands(num_bands);
#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) #if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
can_use_gpu_ = try_gpu && cuda::getCudaEnabledDeviceCount(); can_use_gpu_ = try_gpu && cuda::getCudaEnabledDeviceCount();
#else #else
(void) try_gpu; (void) try_gpu;
@ -491,7 +491,7 @@ void createLaplacePyr(const Mat &img, int num_levels, std::vector<Mat> &pyr)
void createLaplacePyrGpu(const Mat &img, int num_levels, std::vector<Mat> &pyr) void createLaplacePyrGpu(const Mat &img, int num_levels, std::vector<Mat> &pyr)
{ {
#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) #if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
pyr.resize(num_levels + 1); pyr.resize(num_levels + 1);
std::vector<cuda::GpuMat> gpu_pyr(num_levels + 1); std::vector<cuda::GpuMat> gpu_pyr(num_levels + 1);
@ -531,7 +531,7 @@ void restoreImageFromLaplacePyr(std::vector<Mat> &pyr)
void restoreImageFromLaplacePyrGpu(std::vector<Mat> &pyr) void restoreImageFromLaplacePyrGpu(std::vector<Mat> &pyr)
{ {
#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) #if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING)
if (pyr.empty()) if (pyr.empty())
return; return;

4
modules/stitching/src/precomp.hpp
View File

@ -72,8 +72,8 @@
# include "opencv2/cudaarithm.hpp" # include "opencv2/cudaarithm.hpp"
#endif #endif
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
# include "opencv2/gpuwarping.hpp" # include "opencv2/cudawarping.hpp"
#endif #endif
#ifdef HAVE_OPENCV_GPUFEATURES2D #ifdef HAVE_OPENCV_GPUFEATURES2D

2
modules/stitching/src/warpers.cpp
View File

@ -210,7 +210,7 @@ void SphericalWarper::detectResultRoi(Size src_size, Point &dst_tl, Point &dst_b
} }
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
Rect PlaneWarperGpu::buildMaps(Size src_size, const Mat &K, const Mat &R, cuda::GpuMat &xmap, cuda::GpuMat &ymap) Rect PlaneWarperGpu::buildMaps(Size src_size, const Mat &K, const Mat &R, cuda::GpuMat &xmap, cuda::GpuMat &ymap)
{ {
return buildMaps(src_size, K, R, Mat::zeros(3, 1, CV_32F), xmap, ymap); return buildMaps(src_size, K, R, Mat::zeros(3, 1, CV_32F), xmap, ymap);

2
modules/superres/CMakeLists.txt
View File

@ -6,4 +6,4 @@ set(the_description "Super Resolution")
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 -Wundef)
ocv_define_module(superres opencv_imgproc opencv_video ocv_define_module(superres opencv_imgproc opencv_video
OPTIONAL opencv_highgui opencv_ocl OPTIONAL opencv_highgui opencv_ocl
opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec) opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc opencv_gpuoptflow opencv_cudacodec)

2
modules/superres/src/btv_l1_gpu.cpp
View File

@ -50,7 +50,7 @@ using namespace cv::cuda;
using namespace cv::superres; using namespace cv::superres;
using namespace cv::superres::detail; using namespace cv::superres::detail;
#if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_GPUWARPING) || !defined(HAVE_OPENCV_GPUFILTERS) #if !defined(HAVE_CUDA) || !defined(HAVE_OPENCV_CUDAARITHM) || !defined(HAVE_OPENCV_CUDAWARPING) || !defined(HAVE_OPENCV_GPUFILTERS)
Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_GPU() Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_GPU()
{ {

2
modules/superres/src/cuda/btv_l1_gpu.cu
View File

@ -42,7 +42,7 @@
#include "opencv2/opencv_modules.hpp" #include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) #if defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
#include "opencv2/core/cuda/common.hpp" #include "opencv2/core/cuda/common.hpp"
#include "opencv2/core/cuda/transform.hpp" #include "opencv2/core/cuda/transform.hpp"

4
modules/superres/src/precomp.hpp
View File

@ -61,8 +61,8 @@
# include "opencv2/cudaarithm.hpp" # include "opencv2/cudaarithm.hpp"
#endif #endif
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
# include "opencv2/gpuwarping.hpp" # include "opencv2/cudawarping.hpp"
#endif #endif
#ifdef HAVE_OPENCV_GPUFILTERS #ifdef HAVE_OPENCV_GPUFILTERS

2
modules/superres/test/test_superres.cpp
View File

@ -268,7 +268,7 @@ TEST_F(SuperResolution, BTVL1)
RunTest(cv::superres::createSuperResolution_BTVL1()); RunTest(cv::superres::createSuperResolution_BTVL1());
} }
#if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_GPUWARPING) && defined(HAVE_OPENCV_GPUFILTERS) #if defined(HAVE_CUDA) && defined(HAVE_OPENCV_CUDAARITHM) && defined(HAVE_OPENCV_CUDAWARPING) && defined(HAVE_OPENCV_GPUFILTERS)
TEST_F(SuperResolution, BTVL1_GPU) TEST_F(SuperResolution, BTVL1_GPU)
{ {

2
modules/videostab/CMakeLists.txt
View File

@ -1,3 +1,3 @@
set(the_description "Video stabilization") set(the_description "Video stabilization")
ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
OPTIONAL opencv_gpu opencv_gpuwarping opencv_gpuoptflow opencv_highgui) OPTIONAL opencv_gpu opencv_cudawarping opencv_gpuoptflow opencv_highgui)

6
modules/videostab/src/wobble_suppression.cpp
View File

@ -44,8 +44,8 @@
#include "opencv2/videostab/wobble_suppression.hpp" #include "opencv2/videostab/wobble_suppression.hpp"
#include "opencv2/videostab/ring_buffer.hpp" #include "opencv2/videostab/ring_buffer.hpp"
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
# include "opencv2/gpuwarping.hpp" # include "opencv2/cudawarping.hpp"
#endif #endif
#ifdef HAVE_OPENCV_GPU #ifdef HAVE_OPENCV_GPU
@ -122,7 +122,7 @@ void MoreAccurateMotionWobbleSuppressor::suppress(int idx, const Mat &frame, Mat
} }
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const cuda::GpuMat &frame, cuda::GpuMat &result) void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const cuda::GpuMat &frame, cuda::GpuMat &result)
{ {
CV_Assert(motions_ && stabilizationMotions_); CV_Assert(motions_ && stabilizationMotions_);

2
samples/cpp/stitching_detailed.cpp
View File

@ -552,7 +552,7 @@ int main(int argc, char* argv[])
// Warp images and their masks // Warp images and their masks
Ptr<WarperCreator> warper_creator; Ptr<WarperCreator> warper_creator;
#ifdef HAVE_OPENCV_GPUWARPING #ifdef HAVE_OPENCV_CUDAWARPING
if (try_gpu && cuda::getCudaEnabledDeviceCount() > 0) if (try_gpu && cuda::getCudaEnabledDeviceCount() > 0)
{ {
if (warp_type == "plane") warper_creator = new cv::PlaneWarperGpu(); if (warp_type == "plane") warper_creator = new cv::PlaneWarperGpu();

2
samples/gpu/CMakeLists.txt
View File

@ -2,7 +2,7 @@ SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc ope
opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_ml opencv_video opencv_objdetect opencv_features2d
opencv_calib3d opencv_legacy opencv_contrib opencv_gpu opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
opencv_nonfree opencv_softcascade opencv_superres opencv_nonfree opencv_softcascade opencv_superres
opencv_cudaarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc opencv_cudaarithm opencv_gpufilters opencv_cudawarping opencv_gpuimgproc
opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
opencv_gpustereo opencv_cudalegacy) opencv_gpustereo opencv_cudalegacy)

2
samples/gpu/cascadeclassifier.cpp
View File

@ -12,7 +12,7 @@
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/gpu.hpp" #include "opencv2/gpu.hpp"
#include "opencv2/gpuimgproc.hpp" #include "opencv2/gpuimgproc.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
using namespace std; using namespace std;
using namespace cv; using namespace cv;

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

@ -6,7 +6,7 @@
#include "opencv2/gpu.hpp" #include "opencv2/gpu.hpp"
#include "opencv2/gpuimgproc.hpp" #include "opencv2/gpuimgproc.hpp"
#include "opencv2/cudaarithm.hpp" #include "opencv2/cudaarithm.hpp"
#include "opencv2/gpuwarping.hpp" #include "opencv2/cudawarping.hpp"
#include "opencv2/gpufeatures2d.hpp" #include "opencv2/gpufeatures2d.hpp"
#include "opencv2/gpufilters.hpp" #include "opencv2/gpufilters.hpp"
#include "opencv2/gpuoptflow.hpp" #include "opencv2/gpuoptflow.hpp"