generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compilation WITH_TBB

Browse Source
This commit is contained in:
Anatoly Baksheev
2011-05-07 11:37:56 +00:00
parent 1c18e5fef9
commit 927dccb463
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calib3d/src/solvepnp.cpp
View File

@@ -224,10 +224,8 @@ namespace cv
tvec.copyTo(initTvec); tvec.copyTo(initTvec);
} }
private: private:
PnPSolver& operator=(const PnPSolver&); PnPSolver& operator=(const PnPSolver&);
PnPSolver(const PnPSolver&);
const Mat& objectPoints; const Mat& objectPoints;
const Mat& imagePoints; const Mat& imagePoints;
const Parameters& parameters; const Parameters& parameters;

7
modules/objdetect/src/latentsvm.cpp
View File

@@ -272,7 +272,7 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H,
float scoreThreshold, float scoreThreshold,
CvPoint **points, int **levels, int *kPoints, CvPoint **points, int **levels, int *kPoints,
float **score, CvPoint ***partsDisplacement, float **score, CvPoint ***partsDisplacement,
int /*numThreads*/) int numThreads)
{ {
int opResult; int opResult;
@@ -294,6 +294,8 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H,
scoreThreshold, scoreThreshold,
score, points, levels, score, points, levels,
kPoints, partsDisplacement); kPoints, partsDisplacement);
(void)numThreads;
#endif #endif
if (opResult != LATENT_SVM_OK) if (opResult != LATENT_SVM_OK)
{ {
@@ -551,7 +553,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H,
const float *b, float scoreThreshold, const float *b, float scoreThreshold,
CvPoint **points, CvPoint **oppPoints, CvPoint **points, CvPoint **oppPoints,
float **score, int *kPoints, float **score, int *kPoints,
int /*numThreads*/) int numThreads)
{ {
int error = 0; int error = 0;
int i, j, s, f, componentIndex; int i, j, s, f, componentIndex;
@@ -592,6 +594,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H,
return LATENT_SVM_SEARCH_OBJECT_FAILED; return LATENT_SVM_SEARCH_OBJECT_FAILED;
} }
#else #else
(void)numThreads;
searchObjectThreshold(H, &(filters[componentIndex]), kPartFilters[i], searchObjectThreshold(H, &(filters[componentIndex]), kPartFilters[i],
b[i], maxXBorder, maxYBorder, scoreThreshold, b[i], maxXBorder, maxYBorder, scoreThreshold,
&(pointsArr[i]), &(levelsArr[i]), &(kPointsArr[i]), &(pointsArr[i]), &(levelsArr[i]), &(kPointsArr[i]),