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

Merge pull request #700 from cuda-geek/fix_build_with_cuda

Browse Source 
fix master build with CUDA after latest 2.4 merge
This commit is contained in:
Andrey Kamaev
2013-03-25 03:27:31 -07:00
parent 04eabf8d9f dd9e786a8e
commit 8c41c614eb
10 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/hough.cpp
View File

@@ -68,6 +68,8 @@ void cv::gpu::GeneralizedHough_GPU::release() {}
#else /* !defined (HAVE_CUDA) */
#include "opencv2/core/utility.hpp"
namespace cv { namespace gpu { namespace device
{
namespace hough

1
modules/gpu/src/matrix_reductions.cpp
View File

@@ -71,6 +71,7 @@ int cv::gpu::countNonZero(const GpuMat&, GpuMat&) { throw_nogpu(); return 0; }
void cv::gpu::reduce(const GpuMat&, GpuMat&, int, int, int, Stream&) { throw_nogpu(); }
#else
#include "opencv2/core/utility.hpp"
namespace
{

1
modules/gpu/src/stereocsbp.cpp
View File

@@ -55,6 +55,7 @@ cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int, int, int, int, float,
void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }
#else /* !defined (HAVE_CUDA) */
#include "opencv2/core/utility.hpp"
namespace cv { namespace gpu { namespace device
{

8
modules/gpu/test/test_bgfg.cpp
View File

@@ -194,7 +194,7 @@ GPU_TEST_P(MOG, Update)
cv::gpu::MOG_GPU mog;
cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi);
cv::BackgroundSubtractorMOG mog_gold;
cv::Ptr<cv::BackgroundSubtractorMOG> mog_gold = cv::createBackgroundSubtractorMOG();
cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i)
@@ -211,7 +211,7 @@ GPU_TEST_P(MOG, Update)
mog(loadMat(frame, useRoi), foreground, (float)learningRate);
mog_gold(frame, foreground_gold, learningRate);
mog_gold->apply(frame, foreground_gold, learningRate);
ASSERT_MAT_NEAR(foreground_gold, foreground, 0.0);
}
@@ -270,7 +270,7 @@ GPU_TEST_P(MOG2, Update)
cv::gpu::GpuMat foreground = createMat(frame.size(), CV_8UC1, useRoi);
cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2();
mog2_gold.setDetectShadows(detectShadow);
mog2_gold->setDetectShadows(detectShadow);
cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i)
@@ -315,7 +315,7 @@ GPU_TEST_P(MOG2, getBackgroundImage)
cv::gpu::GpuMat foreground;
cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = cv::createBackgroundSubtractorMOG2();
mog2_gold.setDetectShadows(detectShadow);
mog2_gold->setDetectShadows(detectShadow);
cv::Mat foreground_gold;
for (int i = 0; i < 10; ++i)