Compile opencv_test_core with cv::String instead of std::string

All tests passed!
2013-03-20 17:53:13 +04:00
parent 14bb4cbe1e
commit 762aefd71b
51 changed files with 598 additions and 595 deletions
--- a/modules/features2d/src/dynamic.cpp
+++ b/modules/features2d/src/dynamic.cpp
@@ -199,7 +199,7 @@ Ptr<AdjusterAdapter> SurfAdjuster::clone() const
    return cloned_obj;
 }

-Ptr<AdjusterAdapter> AdjusterAdapter::create( const std::string& detectorType )
+Ptr<AdjusterAdapter> AdjusterAdapter::create( const cv::String& detectorType )
 {
    Ptr<AdjusterAdapter> adapter;