storytold/LiveScan3D
2
0
Fork 0
mirror of https://github.com/storytold/LiveScan3D.git synced 2026-10-17 00:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved to Visual Studio 2015, OpenCV 3.2.0, x64

Browse Source
This commit is contained in:
MarekKowalski
2017-02-28 11:30:27 +01:00
parent 44f9a1da22
commit 98bfe298ab
244 changed files with 56126 additions and 68481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/opencv2/flann/timer.h
+6 -5
View File
@@ -32,7 +32,8 @@
#define OPENCV_FLANN_TIMER_H
#include <time.h>
#include "opencv2/core.hpp"
#include "opencv2/core/utility.hpp"
namespace cvflann
{
@@ -44,7 +45,7 @@ namespace cvflann
*/
class StartStopTimer
{
clock_t startTime;
int64 startTime;
public:
/**
@@ -66,7 +67,7 @@ public:
*/
void start()
{
startTime = clock();
startTime = cv::getTickCount();
}
/**
@@ -74,8 +75,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();
}
/**