Fixed ML module build after merge

diff --git a/modules/ml/include/opencv2/ml.hpp b/modules/ml/include/opencv2/ml.hpp
index 7f442b9..f6e3bf2 100644 (file)
--- a/modules/ml/include/opencv2/ml.hpp
+++ b/modules/ml/include/opencv2/ml.hpp
@@ -571,8 +571,6 @@ public:
 /****************************************************************************************\
 *                           Logistic Regression                                          *
 \****************************************************************************************/
-namespace cv
-{
 struct CV_EXPORTS LogisticRegressionParams
 {
     double alpha;
@@ -624,7 +622,6 @@ protected:
     virtual bool set_label_map(const cv::Mat& labels);
     static cv::Mat remap_labels(const cv::Mat& labels, const std::map<int, int>& lmap);
 };
-}// namespace cv
 
 /****************************************************************************************\
 *                           Auxilary functions declarations                              *

diff --git a/modules/ml/src/lr.cpp b/modules/ml/src/lr.cpp
index aa93866..e09a505 100644 (file)
--- a/modules/ml/src/lr.cpp
+++ b/modules/ml/src/lr.cpp
@@ -57,6 +57,7 @@
 
 
 using namespace cv;
+using namespace cv::ml;
 using namespace std;
 
 LogisticRegressionParams::LogisticRegressionParams()

diff --git a/modules/ml/test/test_lr.cpp b/modules/ml/test/test_lr.cpp
index 3aa4cda..90ee7b8 100644 (file)
--- a/modules/ml/test/test_lr.cpp
+++ b/modules/ml/test/test_lr.cpp
@@ -60,7 +60,7 @@
 
 using namespace std;
 using namespace cv;
-
+using namespace cv::ml;
 
 static bool calculateError( const Mat& _p_labels, const Mat& _o_labels, float& error)
 {

diff --git a/samples/cpp/logistic_regression.cpp b/samples/cpp/logistic_regression.cpp
index 1ef261d..2ef41c0 100644 (file)
--- a/samples/cpp/logistic_regression.cpp
+++ b/samples/cpp/logistic_regression.cpp
@@ -65,7 +65,7 @@
 
 using namespace std;
 using namespace cv;
-
+using namespace cv::ml;
 
 int main()
 {