From 927dccb4632f844fba6d936f795f2e90987084a8 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sat, 7 May 2011 11:37:56 +0000 Subject: [PATCH] fixed compilation WITH_TBB --- modules/calib3d/src/solvepnp.cpp | 4 +--- modules/objdetect/src/latentsvm.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp index 2a9de704d1..b0ef1ee46a 100644 --- a/modules/calib3d/src/solvepnp.cpp +++ b/modules/calib3d/src/solvepnp.cpp @@ -224,10 +224,8 @@ namespace cv tvec.copyTo(initTvec); } private: - PnPSolver& operator=(const PnPSolver&); - PnPSolver(const PnPSolver&); - + const Mat& objectPoints; const Mat& imagePoints; const Parameters& parameters; diff --git a/modules/objdetect/src/latentsvm.cpp b/modules/objdetect/src/latentsvm.cpp index e5370feef8..f93ee5fef0 100644 --- a/modules/objdetect/src/latentsvm.cpp +++ b/modules/objdetect/src/latentsvm.cpp @@ -272,7 +272,7 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H, float scoreThreshold, CvPoint **points, int **levels, int *kPoints, float **score, CvPoint ***partsDisplacement, - int /*numThreads*/) + int numThreads) { int opResult; @@ -294,6 +294,8 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H, scoreThreshold, score, points, levels, kPoints, partsDisplacement); + + (void)numThreads; #endif if (opResult != LATENT_SVM_OK) { @@ -551,7 +553,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H, const float *b, float scoreThreshold, CvPoint **points, CvPoint **oppPoints, float **score, int *kPoints, - int /*numThreads*/) + int numThreads) { int error = 0; int i, j, s, f, componentIndex; @@ -592,6 +594,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H, return LATENT_SVM_SEARCH_OBJECT_FAILED; } #else + (void)numThreads; searchObjectThreshold(H, &(filters[componentIndex]), kPartFilters[i], b[i], maxXBorder, maxYBorder, scoreThreshold, &(pointsArr[i]), &(levelsArr[i]), &(kPointsArr[i]),