dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-06 04:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added timing fixes for Visual Studio 2015

Browse Source
This commit is contained in:
Matt Hill
2015-08-12 23:46:37 -04:00
parent bd95aa0ae1
commit a63bd87bcb
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openalpr/support/timing.cpp
View File

@@ -67,7 +67,7 @@ namespace alpr
microseconds = (double)t.QuadPart / frequencyToMicroseconds; microseconds = (double)t.QuadPart / frequencyToMicroseconds;
t.QuadPart = microseconds; t.QuadPart = microseconds;
tv->tv_sec = t.QuadPart / 1000000; tv->tv_sec = t.QuadPart / 1000000;
tv->tv_usec = t.QuadPart % 1000000; tv->tv_nsec = t.QuadPart % 1000000;
return (0); return (0);
} }
@@ -83,7 +83,7 @@ namespace alpr
timespec time_start; timespec time_start;
time_start.tv_sec = 0; time_start.tv_sec = 0;
time_start.tv_usec = 0; time_start.tv_nsec = 0;
return diffclock(time_start, time); return diffclock(time_start, time);
} }
@@ -92,7 +92,7 @@ namespace alpr
double diffclock(timespec time1,timespec time2) double diffclock(timespec time1,timespec time2)
{ {
timespec delta = diff(time1,time2); timespec delta = diff(time1,time2);
double milliseconds = (delta.tv_sec * 1000) + (((double) delta.tv_usec) / 1000.0); double milliseconds = (delta.tv_sec * 1000) + (((double) delta.tv_nsec) / 10000.0);
return milliseconds; return milliseconds;
} }
@@ -100,15 +100,15 @@ namespace alpr
timespec diff(timespec start, timespec end) timespec diff(timespec start, timespec end)
{ {
timespec temp; timespec temp;
if ((end.tv_usec-start.tv_usec)<0) if ((end.tv_nsec-start.tv_nsec)<0)
{ {
temp.tv_sec = end.tv_sec-start.tv_sec-1; temp.tv_sec = end.tv_sec-start.tv_sec-1;
temp.tv_usec = 1000000+end.tv_usec-start.tv_usec; temp.tv_nsec = 1000000+end.tv_nsec-start.tv_nsec;
} }
else else
{ {
temp.tv_sec = end.tv_sec-start.tv_sec; temp.tv_sec = end.tv_sec-start.tv_sec;
temp.tv_usec = end.tv_usec-start.tv_usec; temp.tv_nsec = end.tv_nsec-start.tv_nsec;
} }
return temp; return temp;
} }

18
src/openalpr/support/timing.h
View File

@@ -5,18 +5,20 @@
#include <ctime> #include <ctime>
#include <stdint.h> #include <stdint.h>
#if WINDOWS
struct timespec
{
time_t tv_sec; // Seconds - >= 0
long tv_usec; // Nanoseconds - [0, 999999999]
};
#endif
#ifdef WINDOWS #ifdef WINDOWS
// Import windows only stuff // Import windows only stuff
#include <windows.h> #include <windows.h>
#if _MSC_VER < 1900
struct timespec
{
time_t tv_sec; // Seconds - >= 0
long tv_nsec; // Nanoseconds - [0, 999999999]
};
#else
//#define timespec timeval
#endif
#else #else
#include <sys/time.h> #include <sys/time.h>
#endif #endif