opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-23 09:38:56 +08:00
Code Issues Releases Wiki Activity

Add macro definition to avoid building error.

Browse Source 
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
This commit is contained in:
Yan Wang
2015-11-04 12:58:16 +08:00
parent 06b03a7b65
commit 5eb03d2ed2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/tracking/src/multiTracker.cpp
View File

@@ -119,9 +119,11 @@ namespace cv
//Detect all //Detect all
for (int k = 0; k < targetNum; k++) for (int k = 0; k < targetNum; k++)
tmpCandidates[k] = boundingBoxes[k]; tmpCandidates[k] = boundingBoxes[k];
#ifdef HAVE_OPENCL
if (ocl::haveOpenCL()) if (ocl::haveOpenCL())
ocl_detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers); ocl_detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers);
else else
#endif
detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers); detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers);
for (int k = 0; k < targetNum; k++) for (int k = 0; k < targetNum; k++)
@@ -215,16 +217,20 @@ namespace cv
} }
tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults[k]); tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults[k]);
pExpert.additionalExamples(examplesForModel, examplesForEnsemble); pExpert.additionalExamples(examplesForModel, examplesForEnsemble);
#ifdef HAVE_OPENCL
if (ocl::haveOpenCL()) if (ocl::haveOpenCL())
tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true); tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
else else
#endif
tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true); tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true);
examplesForModel.clear(); examplesForEnsemble.clear(); examplesForModel.clear(); examplesForEnsemble.clear();
nExpert.additionalExamples(examplesForModel, examplesForEnsemble); nExpert.additionalExamples(examplesForModel, examplesForEnsemble);
#ifdef HAVE_OPENCL
if (ocl::haveOpenCL()) if (ocl::haveOpenCL())
tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false); tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
else else
#endif
tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false); tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false);
} }
else else
@@ -434,6 +440,7 @@ namespace cv
} }
} }
#ifdef HAVE_OPENCL
void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector<bool> &detect_flgs, void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector<bool> &detect_flgs,
std::vector<Ptr<Tracker> > &trackers) std::vector<Ptr<Tracker> > &trackers)
{ {
@@ -644,5 +651,6 @@ namespace cv
} }
} }
} }
#endif
} }

2
modules/tracking/src/multiTracker.hpp
View File

@@ -51,7 +51,9 @@ namespace cv
{ {
void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, void detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches,
std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers); std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers);
#ifdef HAVE_OPENCL
void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector<Rect2d>& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches,
std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers); std::vector<bool>& detect_flgs, std::vector<Ptr<Tracker> >& trackers);
#endif
} }
#endif #endif