From d72cc06b969183c188de6c272cda1811ce27aa74 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@itseez.com>
Date: Thu, 11 Oct 2012 22:40:37 +0400
Subject: [PATCH] fixed possibly inccorrect interval measurements in flann's
 timer (bug #1165). Note: this may break binary compatibility, but since the
 class is not wrapped in Java and not exposed in Windows API, for example
 (it's considered internal-use class for flann), the effect should be minimal

---
 modules/flann/include/opencv2/flann/timer.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/flann/include/opencv2/flann/timer.h b/modules/flann/include/opencv2/flann/timer.h
index 107371ecd4..6428b0a0d7 100644
--- a/modules/flann/include/opencv2/flann/timer.h
+++ b/modules/flann/include/opencv2/flann/timer.h
@@ -32,7 +32,7 @@
 #define OPENCV_FLANN_TIMER_H
 
 #include <time.h>
-
+#include "opencv2/core/core.hpp"
 
 namespace cvflann
 {
@@ -44,7 +44,7 @@ namespace cvflann
  */
 class StartStopTimer
 {
-    clock_t startTime;
+    int64 startTime;
 
 public:
     /**
@@ -66,7 +66,7 @@ public:
      */
     void start()
     {
-        startTime = clock();
+        startTime = cv::getTickCount();
     }
 
     /**
@@ -74,8 +74,8 @@ public:
      */
     void stop()
     {
-        clock_t stopTime = clock();
-        value += ( (double)stopTime - startTime) / CLOCKS_PER_SEC;
+        int64 stopTime = cv::getTickCount();
+        value += ( (double)stopTime - startTime) / cv::getTickFrequency();
     }
 
     /**