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

Resolves 32-bit long overflow on non-64 bit architectures

Browse Source
This commit is contained in:
Matt Hill
2015-03-16 23:59:20 -04:00
parent a5bfbca1ae
commit 8aded3b750
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ namespace alpr
clock_gettime(0, time); clock_gettime(0, time);
} }
long getTimeMonotonicMs() int64_t getTimeMonotonicMs()
{ {
timespec time; timespec time;
getTimeMonotonic(&time); getTimeMonotonic(&time);
@@ -114,7 +114,7 @@ namespace alpr
} }
long getEpochTimeMs() int64_t getEpochTimeMs()
{ {
return std::time(0) * 1000; return std::time(0) * 1000;
} }
@@ -146,7 +146,7 @@ namespace alpr
_getTime(false, time); _getTime(false, time);
} }
long getTimeMonotonicMs() int64_t getTimeMonotonicMs()
{ {
timespec time; timespec time;
getTimeMonotonic(&time); getTimeMonotonic(&time);
@@ -161,7 +161,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_nsec) / 1000000.0); double milliseconds = (((double) delta.tv_sec) * 1000.0) + (((double) delta.tv_nsec) / 1000000.0);
return milliseconds; return milliseconds;
} }
@@ -184,7 +184,7 @@ namespace alpr
// Returns wall clock time since Unix epoch (Jan 1, 1970) // Returns wall clock time since Unix epoch (Jan 1, 1970)
long getEpochTimeMs() int64_t getEpochTimeMs()
{ {
timespec time; timespec time;
_getTime(true, &time); _getTime(true, &time);

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

@@ -3,6 +3,7 @@
#include <iostream> #include <iostream>
#include <ctime> #include <ctime>
#include <inttypes.h>
#ifdef WINDOWS #ifdef WINDOWS
// Import windows only stuff // Import windows only stuff
@@ -27,11 +28,11 @@ namespace alpr
{ {
void getTimeMonotonic(timespec* time); void getTimeMonotonic(timespec* time);
long getTimeMonotonicMs(); int64_t getTimeMonotonicMs();
double diffclock(timespec time1,timespec time2); double diffclock(timespec time1,timespec time2);
long getEpochTimeMs(); int64_t getEpochTimeMs();
} }