Merge remote-tracking branch 'upstream/3.4' into merge-3.4

[platform/upstream/opencv.git] / modules / ts / src / ts.cpp

diff --git a/modules/ts/src/ts.cpp b/modules/ts/src/ts.cpp
index dfd20fb..3aa403a 100644 (file)
--- a/modules/ts/src/ts.cpp
+++ b/modules/ts/src/ts.cpp
@@ -263,14 +263,14 @@ void BaseTest::clear()
 }
 
 
-const CvFileNode* BaseTest::find_param( CvFileStorage* fs, const char* param_name )
+cv::FileNode BaseTest::find_param( const cv::FileStorage& fs, const char* param_name )
 {
-    CvFileNode* node = cvGetFileNodeByName(fs, 0, get_name().c_str());
-    return node ? cvGetFileNodeByName( fs, node, param_name ) : 0;
+    cv::FileNode node = fs[get_name()];
+    return node[param_name];
 }
 
 
-int BaseTest::read_params( CvFileStorage* )
+int BaseTest::read_params( const cv::FileStorage& )
 {
     return 0;
 }