From 617dd5db5b4cea0dbf4ae89d83bc5dfb2e324721 Mon Sep 17 00:00:00 2001 From: Marina Noskova Date: Wed, 10 Feb 2016 17:37:05 +0300 Subject: [PATCH] Fixed doc/opencv.bib --- doc/opencv.bib | 12 +++++++++++- modules/ml/include/opencv2/ml.hpp | 1 - modules/ml/src/precomp.hpp | 1 + modules/ml/test/test_mltests2.cpp | 2 -- modules/ml/test/test_save_load.cpp | 6 +----- modules/ts/src/ts_gtest.cpp | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/doc/opencv.bib b/doc/opencv.bib index 17eedf7172..58ede18322 100644 --- a/doc/opencv.bib +++ b/doc/opencv.bib @@ -415,6 +415,16 @@ pages = {2548--2555}, organization = {IEEE} } +@ARTICLE{Louhichi07, + author = {Louhichi, H. and Fournel, T. and Lavest, J. M. and Ben Aissia, H.}, + title = {Self-calibration of Scheimpflug cameras: an easy protocol}, + year = {2007}, + pages = {2616–2622}, + journal = {Meas. Sci. Technol.}, + volume = {18}, + number = {8}, + publisher = {IOP Publishing Ltd} +} @ARTICLE{LibSVM, author = {Chang, Chih-Chung and Lin, Chih-Jen}, title = {LIBSVM: a library for support vector machines}, @@ -871,4 +881,4 @@ pages={177--186}, year={2010}, publisher={Springer} -} \ No newline at end of file +} diff --git a/modules/ml/include/opencv2/ml.hpp b/modules/ml/include/opencv2/ml.hpp index ec7c0730ec..3a8c2ba25b 100644 --- a/modules/ml/include/opencv2/ml.hpp +++ b/modules/ml/include/opencv2/ml.hpp @@ -1697,7 +1697,6 @@ CV_EXPORTS void randMVNormal( InputArray mean, InputArray cov, int nsamples, Out CV_EXPORTS void createConcentricSpheresTestSet( int nsamples, int nfeatures, int nclasses, OutputArray samples, OutputArray responses); - //! @} ml } diff --git a/modules/ml/src/precomp.hpp b/modules/ml/src/precomp.hpp index 0a5fa06035..84821988b6 100644 --- a/modules/ml/src/precomp.hpp +++ b/modules/ml/src/precomp.hpp @@ -45,6 +45,7 @@ #include "opencv2/ml.hpp" #include "opencv2/core/core_c.h" #include "opencv2/core/utility.hpp" + #include "opencv2/core/private.hpp" #include diff --git a/modules/ml/test/test_mltests2.cpp b/modules/ml/test/test_mltests2.cpp index 9cdd368c4c..01f5568daf 100644 --- a/modules/ml/test/test_mltests2.cpp +++ b/modules/ml/test/test_mltests2.cpp @@ -267,9 +267,7 @@ void CV_MLBaseTest::run( int ) { string filename = ts->get_data_path(); filename += get_validation_filename(); - validationFS.open( filename, FileStorage::READ ); - read_params( *validationFS ); int code = cvtest::TS::OK; diff --git a/modules/ml/test/test_save_load.cpp b/modules/ml/test/test_save_load.cpp index f55f9b8a11..d127471cc9 100644 --- a/modules/ml/test/test_save_load.cpp +++ b/modules/ml/test/test_save_load.cpp @@ -150,11 +150,7 @@ int CV_SLMLTest::validate_test_results( int testCaseIdx ) TEST(ML_NaiveBayes, save_load) { CV_SLMLTest test( CV_NBAYES ); test.safe_run(); } TEST(ML_KNearest, save_load) { CV_SLMLTest test( CV_KNEAREST ); test.safe_run(); } -TEST(ML_SVM, save_load) -{ - CV_SLMLTest test( CV_SVM ); - test.safe_run(); -} +TEST(ML_SVM, save_load) { CV_SLMLTest test( CV_SVM ); test.safe_run(); } TEST(ML_ANN, save_load) { CV_SLMLTest test( CV_ANN ); test.safe_run(); } TEST(ML_DTree, save_load) { CV_SLMLTest test( CV_DTREE ); test.safe_run(); } TEST(ML_Boost, save_load) { CV_SLMLTest test( CV_BOOST ); test.safe_run(); } diff --git a/modules/ts/src/ts_gtest.cpp b/modules/ts/src/ts_gtest.cpp index 5604eb7e62..29a3996be8 100644 --- a/modules/ts/src/ts_gtest.cpp +++ b/modules/ts/src/ts_gtest.cpp @@ -5659,7 +5659,7 @@ class TestCaseNameIs { // Returns true iff the name of test_case matches name_. bool operator()(const TestCase* test_case) const { - return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; + return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; } private: