Merge pull request #2166 from ilya-lavrenov:tapi_gftt

2014-01-21 22:29:41 +04:00
parent c8afe7efc6 bfa382cf9d
commit 99942e8043
10 changed files with 539 additions and 193 deletions
--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -392,6 +392,7 @@ CV_EXPORTS void PrintTo(const MatType& t, std::ostream* os);
 namespace cv
 {

+CV_EXPORTS void PrintTo(const String& str, ::std::ostream* os);
 CV_EXPORTS void PrintTo(const Size& sz, ::std::ostream* os);

 } //namespace cv