From 09db5395897c104f2a2d5e5adc8592ef4000c3b9 Mon Sep 17 00:00:00 2001 From: Kristians Vebers Date: Tue, 11 Feb 2014 14:10:06 +0200 Subject: [PATCH 1/3] Added timing support for Mac OS X --- src/openalpr/support/timing.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/openalpr/support/timing.cpp b/src/openalpr/support/timing.cpp index 438660c..0b66891 100644 --- a/src/openalpr/support/timing.cpp +++ b/src/openalpr/support/timing.cpp @@ -1,5 +1,10 @@ #include "timing.h" +#ifdef __MACH__ +#include +#include +#endif + #ifdef WINDOWS @@ -28,7 +33,19 @@ timespec diff(timespec start, timespec end); void getTime(timespec* time) { + +#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time + clock_serv_t cclock; + mach_timespec_t mts; + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); + clock_get_time(cclock, &mts); + mach_port_deallocate(mach_task_self(), cclock); + time->tv_sec = mts.tv_sec; + time->tv_nsec = mts.tv_nsec; +#else clock_gettime(CLOCK_PROCESS_CPUTIME_ID, time); +#endif + } double diffclock(timespec time1,timespec time2) { From 4b0f98d6cf5a8dbabf038c834253a25453c3cef6 Mon Sep 17 00:00:00 2001 From: Kristians Vebers Date: Tue, 11 Feb 2014 14:40:06 +0200 Subject: [PATCH 2/3] Added include to cstdlib for simpleini to work on Mac OS X --- src/openalpr/simpleini/simpleini.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openalpr/simpleini/simpleini.h b/src/openalpr/simpleini/simpleini.h index 5db9a76..366a7f7 100644 --- a/src/openalpr/simpleini/simpleini.h +++ b/src/openalpr/simpleini/simpleini.h @@ -212,6 +212,7 @@ # pragma warning (disable: 4127 4503 4702 4786) #endif +#include #include #include #include From 2842f3764a02938ddade11b079d135c7698ff2dc Mon Sep 17 00:00:00 2001 From: Kristians Vebers Date: Tue, 11 Feb 2014 15:31:20 +0200 Subject: [PATCH 3/3] OpenMP is not yet supported on Mac OS X (clang) --- src/openalpr/utility.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openalpr/utility.cpp b/src/openalpr/utility.cpp index a605aa8..e486010 100644 --- a/src/openalpr/utility.cpp +++ b/src/openalpr/utility.cpp @@ -22,7 +22,9 @@ #include "utility.h" - #include +#ifndef __APPLE__ // CLang++ does not have yet implementet OpenMP +#include +#endif Rect expandRect(Rect original, int expandXPixels, int expandYPixels, int maxX, int maxY) {