From c430d306bb2a6b57a4c54646f14eb6dbe63f8433 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 14:09:46 +0200 Subject: [PATCH 1/7] Bugfix: Unbreak build by defaulting to true. --- src/openalpr/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openalpr/config.cpp b/src/openalpr/config.cpp index d89b7a3..ec6afc1 100644 --- a/src/openalpr/config.cpp +++ b/src/openalpr/config.cpp @@ -241,7 +241,7 @@ namespace alpr } - void Config::debugOff(bool value) + void Config::debugOff(bool value = true) { debugGeneral = !value; debugTiming = !value; From 884a8e48e94d355be182e887931acf050fa79790 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 14:14:54 +0200 Subject: [PATCH 2/7] Brainfart! Forgot about the header file. --- src/openalpr/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openalpr/config.h b/src/openalpr/config.h index 2a1105c..ebcab63 100644 --- a/src/openalpr/config.h +++ b/src/openalpr/config.h @@ -119,7 +119,7 @@ namespace alpr bool debugShowImages; bool debugPauseOnFrame; - void debugOff(bool value); + void debugOff(bool value = true); std::string getKeypointsRuntimeDir(); std::string getCascadeRuntimeDir(); From fbe4cb56479d0255b2780fae7ca9e8e6de784864 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 14:37:14 +0200 Subject: [PATCH 3/7] Ignore visual studio ipch files. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b94a828..724c98b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ src.sln *.sdf *.opensdf *.dir/ +*.ipch Debug/ Release/ From 55c470660a2ebb05bf7365e16a3c680f553bfd2a Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 14:57:20 +0200 Subject: [PATCH 4/7] Bugfix: Method has been moved and renamed. --- src/bindings/csharp/openalpr-net/openalpr-net.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/csharp/openalpr-net/openalpr-net.cpp b/src/bindings/csharp/openalpr-net/openalpr-net.cpp index 7f31828..94c3421 100644 --- a/src/bindings/csharp/openalpr-net/openalpr-net.cpp +++ b/src/bindings/csharp/openalpr-net/openalpr-net.cpp @@ -886,9 +886,9 @@ namespace openalprnet { } } - void DebugOff(bool value) + void SetDebug(bool value) { - this->m_config->debugOff(value); + this->SetDebug(value); } String^ GetKeypointsRuntimeDir() From aba26be26deb0e735e3b8fe6318f4571e659dd27 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 15:03:56 +0200 Subject: [PATCH 5/7] Enable CUDA support in .NET binding. --- src/bindings/csharp/openalpr-net/openalpr-net.vcxproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bindings/csharp/openalpr-net/openalpr-net.vcxproj b/src/bindings/csharp/openalpr-net/openalpr-net.vcxproj index 2734299..690aacc 100644 --- a/src/bindings/csharp/openalpr-net/openalpr-net.vcxproj +++ b/src/bindings/csharp/openalpr-net/openalpr-net.vcxproj @@ -25,9 +25,12 @@ openalprnet 2.1.0 v120 - ..\..\..\..\windows - $(OpenALPRWindowsDir)\build\dist\$(OpenALPRVersion)\$(PlatformToolset)\$(Configuration)\$(Platform) - 248 + ..\..\..\..\windows + None + $(OpenALPRWindowsDir)\build\dist\$(OpenALPRVersion)\$(PlatformToolset)\$(Configuration)\$(Platform) + $(OpenALPRWindowsDir)\build\dist\$(OpenALPRVersion)\$(PlatformToolset)\$(Configuration)\$(Platform)_CUDA_Fermi + $(OpenALPRWindowsDir)\build\dist\$(OpenALPRVersion)\$(PlatformToolset)\$(Configuration)\$(Platform)_CUDA_Kepler + 248 303 170 d From f18c7044a10e1f780b051d46ea4ca51d52b530dd Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 15:10:29 +0200 Subject: [PATCH 6/7] Ignore .orig files. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 724c98b..85221c7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ openalpr_*.tar.gz openalpr-*.asc openalpr-*.sig openalpr-*.tar.gz +*.orig # Visual Studio files src.sln From ae78d52c7e3d3217c0535b66c1242145cccec9ab Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 8 Jul 2015 20:17:47 +0200 Subject: [PATCH 7/7] Bugfix: Stack overflow. --- src/bindings/csharp/openalpr-net/openalpr-net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/csharp/openalpr-net/openalpr-net.cpp b/src/bindings/csharp/openalpr-net/openalpr-net.cpp index 94c3421..2849380 100644 --- a/src/bindings/csharp/openalpr-net/openalpr-net.cpp +++ b/src/bindings/csharp/openalpr-net/openalpr-net.cpp @@ -888,7 +888,7 @@ namespace openalprnet { void SetDebug(bool value) { - this->SetDebug(value); + this->m_config->setDebug(value); } String^ GetKeypointsRuntimeDir()