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

exclude compactPoints and calcWobbleSuppressionMaps from compilation

Browse Source 
if they are not needed
This commit is contained in:
Vladislav Vinogradov 2015-01-22 16:36:16 +03:00
parent 6ebc95470b
commit c9e07bbc95
2 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/videostab/src/global_motion.cpp
View File

@ -49,19 +49,16 @@
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
#if !defined HAVE_CUDA || defined(CUDA_DISABLER) #if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_CUDAOPTFLOW)
#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
namespace cv { namespace cuda { namespace cv { namespace cuda {
static void compactPoints(GpuMat&, GpuMat&, const GpuMat&) { throw_no_cuda(); } static void compactPoints(GpuMat&, GpuMat&, const GpuMat&) { throw_no_cuda(); }
}} }}
#else
#else namespace cv { namespace cuda { namespace device { namespace globmotion {
namespace cv { namespace cuda { namespace device { namespace globmotion {
int compactPoints(int N, float *points0, float *points1, const uchar *mask); int compactPoints(int N, float *points0, float *points1, const uchar *mask);
}}}} }}}}
namespace cv { namespace cuda {
namespace cv { namespace cuda {
static void compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mask) static void compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mask)
{ {
CV_Assert(points0.rows == 1 && points1.rows == 1 && mask.rows == 1); CV_Assert(points0.rows == 1 && points1.rows == 1 && mask.rows == 1);
@ -75,8 +72,8 @@ namespace cv { namespace cuda {
points0 = points0.colRange(0, remaining); points0 = points0.colRange(0, remaining);
points1 = points1.colRange(0, remaining); points1 = points1.colRange(0, remaining);
} }
}} }}
#endif
#endif #endif
namespace cv namespace cv

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

@ -50,21 +50,18 @@
# include "opencv2/cudawarping.hpp" # include "opencv2/cudawarping.hpp"
#endif #endif
#if !defined HAVE_CUDA || defined(CUDA_DISABLER) #if defined(HAVE_OPENCV_CUDAWARPING)
#if !defined HAVE_CUDA || defined(CUDA_DISABLER)
namespace cv { namespace cuda { namespace cv { namespace cuda {
static void calcWobbleSuppressionMaps(int, int, int, Size, const Mat&, const Mat&, GpuMat&, GpuMat&) { throw_no_cuda(); } static void calcWobbleSuppressionMaps(int, int, int, Size, const Mat&, const Mat&, GpuMat&, GpuMat&) { throw_no_cuda(); }
}} }}
#else
#else namespace cv { namespace cuda { namespace device { namespace globmotion {
namespace cv { namespace cuda { namespace device { namespace globmotion {
void calcWobbleSuppressionMaps( void calcWobbleSuppressionMaps(
int left, int idx, int right, int width, int height, int left, int idx, int right, int width, int height,
const float *ml, const float *mr, PtrStepSzf mapx, PtrStepSzf mapy); const float *ml, const float *mr, PtrStepSzf mapx, PtrStepSzf mapy);
}}}} }}}}
namespace cv { namespace cuda {
namespace cv { namespace cuda {
static void calcWobbleSuppressionMaps( static void calcWobbleSuppressionMaps(
int left, int idx, int right, Size size, const Mat &ml, const Mat &mr, int left, int idx, int right, Size size, const Mat &ml, const Mat &mr,
GpuMat &mapx, GpuMat &mapy) GpuMat &mapx, GpuMat &mapy)
@ -79,8 +76,8 @@ namespace cv { namespace cuda {
left, idx, right, size.width, size.height, left, idx, right, size.width, size.height,
ml.ptr<float>(), mr.ptr<float>(), mapx, mapy); ml.ptr<float>(), mr.ptr<float>(), mapx, mapy);
} }
}} }}
#endif
#endif #endif
namespace cv namespace cv