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

Merge pull request #2940 from davembradley:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-07-29 17:22:30 +00:00
commit dce1824a91
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/cudabgsegm/perf/perf_bgsegm.cpp
View File

@ -42,8 +42,8 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#ifdef HAVE_OPENCV_LEGACY #ifdef HAVE_OPENCV_CUDALEGACY
# include "opencv2/legacy.hpp" # include "opencv2/cudalegacy.hpp"
#endif #endif
#ifdef HAVE_OPENCV_CUDAIMGPROC #ifdef HAVE_OPENCV_CUDAIMGPROC
@ -72,7 +72,7 @@ using namespace perf;
#if BUILD_WITH_VIDEO_INPUT_SUPPORT #if BUILD_WITH_VIDEO_INPUT_SUPPORT
#ifdef HAVE_OPENCV_LEGACY #ifdef HAVE_OPENCV_CUDALEGACY
namespace cv namespace cv
{ {
@ -150,7 +150,7 @@ PERF_TEST_P(Video, FGDStatModel,
} }
else else
{ {
#ifdef HAVE_OPENCV_LEGACY #ifdef HAVE_OPENCV_CUDALEGACY
IplImage ipl_frame = frame; IplImage ipl_frame = frame;
cv::Ptr<CvBGStatModel> model(cvCreateFGDStatModel(&ipl_frame)); cv::Ptr<CvBGStatModel> model(cvCreateFGDStatModel(&ipl_frame));

6
modules/cudabgsegm/test/test_bgsegm.cpp
View File

@ -42,8 +42,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#ifdef HAVE_OPENCV_LEGACY #ifdef HAVE_OPENCV_CUDALEGACY
# include "opencv2/legacy.hpp" # include "opencv2/cudalegacy.hpp"
#endif #endif
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
@ -66,7 +66,7 @@ using namespace cvtest;
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// FGDStatModel // FGDStatModel
#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined(HAVE_OPENCV_LEGACY) #if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined(HAVE_OPENCV_CUDALEGACY)
namespace cv namespace cv
{ {