From: atinfinity <dandelion1124@gmail.com>
Date: Fri, 6 Jun 2014 22:29:22 +0000 (+0900)
Subject: fixed calculation method of "cv::TickMeter"
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~198^2~7^2~17^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f08d88fa78aab8b2193c80ecfb9893cddff362d5;p=profile%2Fivi%2Fopencv.git

fixed calculation method of "cv::TickMeter"
---

diff --git a/modules/contrib/src/spinimages.cpp b/modules/contrib/src/spinimages.cpp
index 747bf3e..d220ad7 100644
--- a/modules/contrib/src/spinimages.cpp
+++ b/modules/contrib/src/spinimages.cpp
@@ -1209,16 +1209,16 @@ private:
 
 cv::TickMeter::TickMeter() { reset(); }
 int64 cv::TickMeter::getTimeTicks() const { return sumTime; }
-double cv::TickMeter::getTimeMicro() const { return (double)getTimeTicks()/cvGetTickFrequency(); }
-double cv::TickMeter::getTimeMilli() const { return getTimeMicro()*1e-3; }
-double cv::TickMeter::getTimeSec()   const { return getTimeMilli()*1e-3; }
+double cv::TickMeter::getTimeSec()   const { return (double)getTimeTicks()/getTickFrequency(); }
+double cv::TickMeter::getTimeMilli() const { return getTimeSec()*1e3; }
+double cv::TickMeter::getTimeMicro() const { return getTimeMilli()*1e3; }
 int64 cv::TickMeter::getCounter() const { return counter; }
 void  cv::TickMeter::reset() {startTime = 0; sumTime = 0; counter = 0; }
 
-void cv::TickMeter::start(){ startTime = cvGetTickCount(); }
+void cv::TickMeter::start(){ startTime = getTickCount(); }
 void cv::TickMeter::stop()
 {
-    int64 time = cvGetTickCount();
+    int64 time = getTickCount();
     if ( startTime == 0 )
         return;