Last active
August 29, 2015 14:26
-
-
Save peters/6bd5d4102fa0d5e28138 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/openalpr/support/timing.cpp b/src/openalpr/support/timing.cpp | |
index 82c8374..d0a8055 100644 | |
--- a/src/openalpr/support/timing.cpp | |
+++ b/src/openalpr/support/timing.cpp | |
@@ -67,7 +67,7 @@ namespace alpr | |
microseconds = (double)t.QuadPart / frequencyToMicroseconds; | |
t.QuadPart = microseconds; | |
tv->tv_sec = t.QuadPart / 1000000; | |
- tv->tv_usec = t.QuadPart % 1000000; | |
+ tv->tv_nsec = t.QuadPart % 1000000; | |
return (0); | |
} | |
@@ -83,7 +83,7 @@ namespace alpr | |
timespec time_start; | |
time_start.tv_sec = 0; | |
- time_start.tv_usec = 0; | |
+ time_start.tv_nsec = 0; | |
return diffclock(time_start, time); | |
} | |
@@ -92,7 +92,7 @@ namespace alpr | |
double diffclock(timespec time1,timespec 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; | |
} | |
@@ -100,15 +100,15 @@ namespace alpr | |
timespec diff(timespec start, timespec end) | |
{ | |
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_usec = 1000000+end.tv_usec-start.tv_usec; | |
+ temp.tv_nsec = 1000000+end.tv_nsec -start.tv_nsec; | |
} | |
else | |
{ | |
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; | |
} | |
diff --git a/src/openalpr/support/timing.h b/src/openalpr/support/timing.h | |
index 9a022e6..91798a0 100644 | |
--- a/src/openalpr/support/timing.h | |
+++ b/src/openalpr/support/timing.h | |
@@ -20,8 +20,13 @@ | |
// Support for Windows | |
#ifdef WINDOWS | |
#include <windows.h> | |
- | |
-#define timespec timeval | |
+#if _MSC_VER < 1900 | |
+struct timespec | |
+{ | |
+ time_t tv_sec; // Seconds - >= 0 | |
+ long tv_nsec; // Nanoseconds - [0, 999999999] | |
+}; | |
+#endif | |
#endif | |
namespace alpr |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment