From 5eb03d2ed2f2ef5519e94ca768b7bbcf7fd47868 Mon Sep 17 00:00:00 2001 From: Yan Wang Date: Wed, 4 Nov 2015 12:58:16 +0800 Subject: [PATCH] Add macro definition to avoid building error. Signed-off-by: Yan Wang --- modules/tracking/src/multiTracker.cpp | 8 ++++++++ modules/tracking/src/multiTracker.hpp | 2 ++ 2 files changed, 10 insertions(+) diff --git a/modules/tracking/src/multiTracker.cpp b/modules/tracking/src/multiTracker.cpp index 4acdd89ea..796606128 100644 --- a/modules/tracking/src/multiTracker.cpp +++ b/modules/tracking/src/multiTracker.cpp @@ -119,9 +119,11 @@ namespace cv //Detect all for (int k = 0; k < targetNum; k++) tmpCandidates[k] = boundingBoxes[k]; +#ifdef HAVE_OPENCL if (ocl::haveOpenCL()) ocl_detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers); else +#endif detect_all(imageForDetector, image_blurred, tmpCandidates, detectorResults, detect_flgs, trackers); for (int k = 0; k < targetNum; k++) @@ -215,16 +217,20 @@ namespace cv } tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults[k]); pExpert.additionalExamples(examplesForModel, examplesForEnsemble); +#ifdef HAVE_OPENCL if (ocl::haveOpenCL()) tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true); else +#endif tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true); examplesForModel.clear(); examplesForEnsemble.clear(); nExpert.additionalExamples(examplesForModel, examplesForEnsemble); +#ifdef HAVE_OPENCL if (ocl::haveOpenCL()) tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false); else +#endif tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false); } else @@ -434,6 +440,7 @@ namespace cv } } +#ifdef HAVE_OPENCL void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector &detect_flgs, std::vector > &trackers) { @@ -644,5 +651,6 @@ namespace cv } } } +#endif } \ No newline at end of file diff --git a/modules/tracking/src/multiTracker.hpp b/modules/tracking/src/multiTracker.hpp index 9d363802c..4ab654e9b 100644 --- a/modules/tracking/src/multiTracker.hpp +++ b/modules/tracking/src/multiTracker.hpp @@ -51,7 +51,9 @@ namespace cv { void detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector& detect_flgs, std::vector >& trackers); +#ifdef HAVE_OPENCL void ocl_detect_all(const Mat& img, const Mat& imgBlurred, std::vector& res, std::vector < std::vector < tld::TLDDetector::LabeledPatch > > &patches, std::vector& detect_flgs, std::vector >& trackers); +#endif } #endif \ No newline at end of file