Merge pull request #2940 from davembradley:master

11 years ago · dce1824a91
parent cf2a307832 b71744082b
commit dce1824a91
2 changed files with 7 additions and 7 deletions
--- a/modules/cudabgsegm/perf/perf_bgsegm.cpp
+++ b/modules/cudabgsegm/perf/perf_bgsegm.cpp
@ -42,8 +42,8 @@

 #include "perf_precomp.hpp"

-#ifdef HAVE_OPENCV_LEGACY
-#  include "opencv2/legacy.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy.hpp"
 #endif

 #ifdef HAVE_OPENCV_CUDAIMGPROC
@ -72,7 +72,7 @@ using namespace perf;

 #if BUILD_WITH_VIDEO_INPUT_SUPPORT

-#ifdef HAVE_OPENCV_LEGACY
+#ifdef HAVE_OPENCV_CUDALEGACY

 namespace cv
 {
@ -150,7 +150,7 @@ PERF_TEST_P(Video, FGDStatModel,
    }
    else
    {
-#ifdef HAVE_OPENCV_LEGACY
+#ifdef HAVE_OPENCV_CUDALEGACY
        IplImage ipl_frame = frame;
        cv::Ptr<CvBGStatModel> model(cvCreateFGDStatModel(&ipl_frame));

--- a/modules/cudabgsegm/test/test_bgsegm.cpp
+++ b/modules/cudabgsegm/test/test_bgsegm.cpp
@ -42,8 +42,8 @@

 #include "test_precomp.hpp"

-#ifdef HAVE_OPENCV_LEGACY
-#  include "opencv2/legacy.hpp"
+#ifdef HAVE_OPENCV_CUDALEGACY
+#  include "opencv2/cudalegacy.hpp"
 #endif

 #ifdef HAVE_CUDA
@ -66,7 +66,7 @@ using namespace cvtest;
 //////////////////////////////////////////////////////
 // FGDStatModel

-#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined(HAVE_OPENCV_LEGACY)
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT && defined(HAVE_OPENCV_CUDALEGACY)

 namespace cv
 {