mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

made objdetect dependecy for gpunvidia optional

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-04-09 12:50:22 +04:00
parent e654714973
commit ca474de639
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpunvidia/CMakeLists.txt
View File

@ -6,4 +6,4 @@ set(the_description "GPU-accelerated Computer Vision (HAL module)")
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
ocv_define_module(gpunvidia opencv_core opencv_objdetect)
ocv_define_module(gpunvidia opencv_core OPTIONAL opencv_objdetect)

8
modules/gpunvidia/src/NCV.cpp
View File

@ -737,6 +737,13 @@ struct RectConvert
static void groupRectangles(std::vector<NcvRect32u> &hypotheses, int groupThreshold, double eps, std::vector<Ncv32u> *weights)
{
#ifndef HAVE_OPENCV_OBJDETECT
(void) hypotheses;
(void) groupThreshold;
(void) eps;
(void) weights;
CV_Error(cv::Error::StsNotImplemented, "This functionality requires objdetect module");
#else
std::vector<cv::Rect> rects(hypotheses.size());
std::transform(hypotheses.begin(), hypotheses.end(), rects.begin(), RectConvert());
@ -752,6 +759,7 @@ static void groupRectangles(std::vector<NcvRect32u> &hypotheses, int groupThresh
}
std::transform(rects.begin(), rects.end(), hypotheses.begin(), RectConvert());
hypotheses.resize(rects.size());
#endif
}

17
modules/gpunvidia/src/cuda/NCVHaarObjectDetection.cu
View File

@ -61,7 +61,12 @@
#include "opencv2/core/cuda/warp.hpp"
#include "opencv2/core/cuda/warp_shuffle.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_OBJDETECT
# include "opencv2/objdetect.hpp"
#endif
#include "opencv2/gpunvidia/NCV.hpp"
#include "opencv2/gpunvidia/NPP_staging.hpp"
@ -2106,6 +2111,15 @@ static NCVStatus loadFromXML(const cv::String &filename,
std::vector<HaarClassifierNode128> &haarClassifierNodes,
std::vector<HaarFeature64> &haarFeatures)
{
#ifndef HAVE_OPENCV_OBJDETECT
(void) filename;
(void) haar;
(void) haarStages;
(void) haarClassifierNodes;
(void) haarFeatures;
CV_Error(cv::Error::StsNotImplemented, "This functionality requires objdetect module");
return NCV_HAAR_XML_LOADING_EXCEPTION;
#else
NCVStatus ncvStat;
haar.NumStages = 0;
@ -2294,6 +2308,7 @@ static NCVStatus loadFromXML(const cv::String &filename,
}
return NCV_SUCCESS;
#endif
}

7
modules/gpunvidia/src/precomp.hpp
View File

@ -49,7 +49,12 @@
#include "opencv2/gpunvidia.hpp"
#include "opencv2/core/utility.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_OBJDETECT
# include "opencv2/objdetect.hpp"
#endif
#include "opencv2/core/gpu_private.hpp"
#include "opencv2/gpunvidia/private.hpp"