From 6d68f72473ee7e20429c8ff763783e5fbfb1d425 Mon Sep 17 00:00:00 2001 From: theodore Date: Sat, 15 Aug 2015 14:12:40 +0200 Subject: [PATCH 1/2] bug fix fro the TickMeter class --- samples/gpu/tick_meter.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/gpu/tick_meter.hpp b/samples/gpu/tick_meter.hpp index d0a428b878..9236ac91db 100644 --- 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()*1e-3;} +double TickMeter::getTimeMilli() const { return getTimeSec()*1e-3; } +double TickMeter::getTimeSec() const { return (double)getTimeTicks()/cv::getTickFrequency();} int64 TickMeter::getCounter() const { return counter; } void TickMeter::reset() {startTime = 0; sumTime = 0; counter = 0; } From 9449af8adafbb5cbe2be1d76457dd882a9962a12 Mon Sep 17 00:00:00 2001 From: theodore Date: Mon, 17 Aug 2015 15:52:16 +0200 Subject: [PATCH 2/2] 1e-3 -> 1e3 --- samples/gpu/tick_meter.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/gpu/tick_meter.hpp b/samples/gpu/tick_meter.hpp index 9236ac91db..c11a22d140 100644 --- a/samples/gpu/tick_meter.hpp +++ b/samples/gpu/tick_meter.hpp @@ -26,8 +26,8 @@ std::ostream& operator << (std::ostream& out, const TickMeter& tm); TickMeter::TickMeter() { reset(); } int64 TickMeter::getTimeTicks() const { return sumTime; } -double TickMeter::getTimeMicro() const { return getTimeMilli()*1e-3;} -double TickMeter::getTimeMilli() const { return getTimeSec()*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; }