Merge pull request #2166 from ilya-lavrenov:tapi_gftt

This commit is contained in:
Andrey Pavlenko
2014-01-21 22:29:41 +04:00
committed by OpenCV Buildbot
10 changed files with 539 additions and 193 deletions

View File

@@ -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

View File

@@ -1199,7 +1199,7 @@ void TestBase::validateMetrics()
double mean = metrics.mean * 1000.0f / metrics.frequency;
double stddev = metrics.stddev * 1000.0f / metrics.frequency;
double percents = stddev / mean * 100.f;
printf(" samples = %d, mean = %.2f, stddev = %.2f (%.1f%%)\n", (int)metrics.samples, mean, stddev, percents);
printf("[ PERFSTAT ] (samples = %d, mean = %.2f, stddev = %.2f (%.1f%%))\n", (int)metrics.samples, mean, stddev, percents);
}
else
{
@@ -1611,6 +1611,11 @@ void PrintTo(const MatType& t, ::std::ostream* os)
\*****************************************************************************************/
namespace cv {
void PrintTo(const String& str, ::std::ostream* os)
{
*os << str;
}
void PrintTo(const Size& sz, ::std::ostream* os)
{
*os << /*"Size:" << */sz.width << "x" << sz.height;