fixed compilation WITH_TBB

diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp
index 2a9de70..b0ef1ee 100644 (file)
--- 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 e5370fe..f93ee5f 100644 (file)
--- a/modules/objdetect/src/latentsvm.cpp
+++ b/modules/objdetect/src/latentsvm.cpp
@@ -272,7 +272,7 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H,
                           float scoreThreshold,\r
                           CvPoint **points, int **levels, int *kPoints, \r
                           float **score, CvPoint ***partsDisplacement,\r
-                          int /*numThreads*/)\r
+                          int numThreads)\r
 {\r
     int opResult;\r
 \r
@@ -294,6 +294,8 @@ int searchObjectThreshold(const CvLSVMFeaturePyramid *H,
                                         scoreThreshold, \r
                                         score, points, levels, \r
                                         kPoints, partsDisplacement);\r
+\r
+       (void)numThreads;\r
 #endif\r
     if (opResult != LATENT_SVM_OK)\r
     {\r
@@ -551,7 +553,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H,
                                         const float *b, float scoreThreshold,\r
                                         CvPoint **points, CvPoint **oppPoints,\r
                                         float **score, int *kPoints,\r
-                                        int /*numThreads*/)\r
+                                        int numThreads)\r
 {\r
     int error = 0;\r
     int i, j, s, f, componentIndex;\r
@@ -592,6 +594,7 @@ int searchObjectThresholdSomeComponents(const CvLSVMFeaturePyramid *H,
             return LATENT_SVM_SEARCH_OBJECT_FAILED;\r
         }\r
 #else\r
+               (void)numThreads;\r
         searchObjectThreshold(H, &(filters[componentIndex]), kPartFilters[i],\r
             b[i], maxXBorder, maxYBorder, scoreThreshold, \r
             &(pointsArr[i]), &(levelsArr[i]), &(kPointsArr[i]), \r