From db391fdfdd6b9381dd4b1ca408dffca96f5df4ac Mon Sep 17 00:00:00 2001 From: Rok Mandeljc Date: Sat, 30 Aug 2014 00:55:06 +0200 Subject: [PATCH] samples: gpu: performance: BackgroundSubtractorMOG is now part of opencv_bgsegm module --- samples/gpu/performance/CMakeLists.txt | 8 ++++++++ samples/gpu/performance/tests.cpp | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/samples/gpu/performance/CMakeLists.txt b/samples/gpu/performance/CMakeLists.txt index d283c76..9c9fb5b 100644 --- a/samples/gpu/performance/CMakeLists.txt +++ b/samples/gpu/performance/CMakeLists.txt @@ -7,6 +7,10 @@ if(HAVE_opencv_xfeatures2d) ocv_include_directories("${opencv_xfeatures2d_SOURCE_DIR}/include") endif() +if(HAVE_opencv_bgsegm) + ocv_include_directories("${opencv_bgsegm_SOURCE_DIR}/include") +endif() + add_executable(${the_target} ${sources} ${headers}) ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS}) @@ -14,6 +18,10 @@ if(HAVE_opencv_xfeatures2d) ocv_target_link_libraries(${the_target} opencv_xfeatures2d) endif() +if(HAVE_opencv_bgsegm) + ocv_target_link_libraries(${the_target} opencv_bgsegm) +endif() + set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "performance_gpu" PROJECT_LABEL "(EXAMPLE_CUDA) performance") diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index cecf1ce..e5bdb04 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -21,6 +21,10 @@ #include "opencv2/xfeatures2d/nonfree.hpp" #endif +#ifdef HAVE_OPENCV_BGSEGM +#include "opencv2/bgsegm.hpp" +#endif + using namespace std; using namespace cv; @@ -1266,6 +1270,8 @@ TEST(FarnebackOpticalFlow) }}} } +#ifdef HAVE_OPENCV_BGSEGM + TEST(MOG) { const std::string inputFile = abspath("768x576.avi"); @@ -1276,7 +1282,7 @@ TEST(MOG) cv::Mat frame; cap >> frame; - cv::Ptr mog = cv::createBackgroundSubtractorMOG(); + cv::Ptr mog = cv::bgsegm::createBackgroundSubtractorMOG(); cv::Mat foreground; mog->apply(frame, foreground, 0.01); @@ -1317,6 +1323,8 @@ TEST(MOG) TestSystem::instance().gpuComplete(); } +#endif + TEST(MOG2) { const std::string inputFile = abspath("768x576.avi"); -- 2.7.4