fixing build;

Author: Dinar Ahmatnurov

modules/latentsvm/perf/perf_cascadeclassifier.cpp

@@ -1,5 +1,5 @@
 #include "perf_precomp.hpp"
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 
 using namespace std;
 using namespace cv;

modules/latentsvm/src/precomp.hpp

@@ -57,9 +57,8 @@
 #include "opencv2/core/core_c.h"
 
 #include "opencv2/opencv_modules.hpp"
-#ifdef HAVE_OPENCV_HIGHGUI
-	#include "opencv2/highgui/highgui_c.h"
-#endif
+#include "opencv2/highgui/highgui_c.h"
+
 
 #ifdef HAVE_TEGRA_OPTIMIZATION
 #include "opencv2/objdetect/objdetect_tegra.hpp"

modules/latentsvm/test/test_latentsvmdetector_caskade.cpp

@@ -43,6 +43,7 @@
 #include "test_precomp.hpp"
 
 #include <string>
+#include "opencv2/highgui/highgui_c.h"
 
 #ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
@@ -76,8 +77,8 @@ bool CV_LatentSVMDetectorCaskadeTest::isEqual(CvRect r1, CvRect r2, int eps)
 
 void CV_LatentSVMDetectorCaskadeTest::run( int /* start_from */)
 {
-    string img_path = string(ts->get_data_path()) + "cat.png";
-    string model_path = string(ts->get_data_path()) + "models_VOC2007_caskade/cat.xml";
+    std::string img_path = std::string(ts->get_data_path()) + "cat.png";
+    std::string model_path = std::string(ts->get_data_path()) + "models_VOC2007_caskade/cat.xml";
 
 #ifdef HAVE_TBB
     int numThreads = 2;
@@ -140,7 +141,7 @@ class LatentSVMDetectorCaskadeTest : public cvtest::BaseTest
     void run(int);
 };
 
-static void writeDetections( FileStorage& fs, const string& nodeName, const vector<lsvmc::LatentSvmDetector::ObjectDetection>& detections )
+static void writeDetections( FileStorage& fs, const std::string& nodeName, const std::vector<lsvmc::LatentSvmDetector::ObjectDetection>& detections )
 {
     fs << nodeName << "[";
     for( size_t i = 0; i < detections.size(); i++ )
@@ -152,8 +153,8 @@ static void writeDetections( FileStorage& fs, const string& nodeName, const vect
     fs << "]";
 }
 
-static void readDetections( FileStorage fs, const string& nodeName, 
-                           vector<lsvmc::LatentSvmDetector::ObjectDetection>& detections )
+static void readDetections( FileStorage fs, const std::string& nodeName, 
+                           std::vector<lsvmc::LatentSvmDetector::ObjectDetection>& detections )
 {
     detections.clear();
 
@@ -182,8 +183,8 @@ static inline bool isEqualCaskad( const lsvmc::LatentSvmDetector::ObjectDetectio
 }
 
 
-bool compareResults( const vector<lsvmc::LatentSvmDetector::ObjectDetection>& calc, 
-                    const vector<lsvmc::LatentSvmDetector::ObjectDetection>& valid, int eps, float threshold)
+bool compareResults( const std::vector<lsvmc::LatentSvmDetector::ObjectDetection>& calc, 
+                    const std::vector<lsvmc::LatentSvmDetector::ObjectDetection>& valid, int eps, float threshold)
 {
     if( calc.size() != valid.size() )
         return false;
@@ -205,13 +206,13 @@ bool compareResults( const vector<lsvmc::LatentSvmDetector::ObjectDetection>& ca
 
 void LatentSVMDetectorCaskadeTest::run( int /* start_from */)
 {
-    string img_path_cat = string(ts->get_data_path()) + "cat.png";
-    string img_path_cars = string(ts->get_data_path()) + "cars.png";
+    std::string img_path_cat = std::string(ts->get_data_path()) + "cat.png";
+    std::string img_path_cars = std::string(ts->get_data_path()) + "cars.png";
 
-    string model_path_cat = string(ts->get_data_path()) + "models_VOC2007_caskade/cat.xml";
-    string model_path_car = string(ts->get_data_path()) + "models_VOC2007_caskade/car.xml";
+    std::string model_path_cat = std::string(ts->get_data_path()) + "models_VOC2007_caskade/cat.xml";
+    std::string model_path_car = std::string(ts->get_data_path()) + "models_VOC2007_caskade/car.xml";
 
-    string true_res_path = string(ts->get_data_path()) + "results_caskad.xml";
+    std::string true_res_path = std::string(ts->get_data_path()) + "results_caskad.xml";
 
 
 #ifdef HAVE_TBB
@@ -231,9 +232,9 @@ void LatentSVMDetectorCaskadeTest::run( int /* start_from */)
     // detector12 - to test case of two (several) classes 'cat' and car
 
     // Load detectors
-    lsvmc::LatentSvmDetector detector1( vector<string>(1,model_path_cat) );
+    lsvmc::LatentSvmDetector detector1( std::vector<std::string>(1,model_path_cat) );
 
-    vector<string> models_pathes(2);
+    std::vector<std::string> models_pathes(2);
     models_pathes[0] = model_path_cat;
     models_pathes[1] = model_path_car;
     lsvmc::LatentSvmDetector detector12( models_pathes );
@@ -246,7 +247,7 @@ void LatentSVMDetectorCaskadeTest::run( int /* start_from */)
 
     // 1. Test method detect
     // Run detectors
-    vector<lsvmc::LatentSvmDetector::ObjectDetection> detections1_cat, detections12_cat, detections12_cars;
+    std::vector<lsvmc::LatentSvmDetector::ObjectDetection> detections1_cat, detections12_cat, detections12_cars;
     detector1.detect( image_cat, detections1_cat, 0.5);
     detector12.detect( image_cat, detections12_cat, 0.5);
     detector12.detect( image_cars, detections12_cars, 0.5);
@@ -255,7 +256,7 @@ void LatentSVMDetectorCaskadeTest::run( int /* start_from */)
     FileStorage fs( true_res_path, FileStorage::READ );
     if( fs.isOpened() )
     {
-        vector<lsvmc::LatentSvmDetector::ObjectDetection> true_detections1_cat, true_detections12_cat, true_detections12_cars;
+        std::vector<lsvmc::LatentSvmDetector::ObjectDetection> true_detections1_cat, true_detections12_cat, true_detections12_cars;
         readDetections( fs, "detections1_cat", true_detections1_cat );
         readDetections( fs, "detections12_cat", true_detections12_cat );
         readDetections( fs, "detections12_cars", true_detections12_cars );