Merge pull request #5199 from TheodoreT:tickmeter_update

10 years ago · ca5e07d342
parent 365603e1c2 9449af8ada
commit ca5e07d342
1 changed files with 3 additions and 3 deletions
--- a/samples/gpu/tick_meter.hpp
+++ b/samples/gpu/tick_meter.hpp
@ -26,9 +26,9 @@ std::ostream& operator << (std::ostream& out, const TickMeter& tm);

 TickMeter::TickMeter() { reset(); }
 int64 TickMeter::getTimeTicks() const { return sumTime; }
-double TickMeter::getTimeMicro() const { return (double)getTimeTicks()/cv::getTickFrequency(); }
-double TickMeter::getTimeMilli() const { return getTimeMicro()*1e-3; }
-double TickMeter::getTimeSec() const { return getTimeMilli()*1e-3; }
+double TickMeter::getTimeMicro() const { return  getTimeMilli()*1e3;}
+double TickMeter::getTimeMilli() const { return getTimeSec()*1e3; }
+double TickMeter::getTimeSec() const { return (double)getTimeTicks()/cv::getTickFrequency();}
 int64 TickMeter::getCounter() const { return counter; }
 void TickMeter::reset() {startTime = 0; sumTime = 0; counter = 0; }