Commit Graph

733 Commits

Author SHA1 Message Date
Matt Hill
7d8921b1cf Fixed typo from merge 2014-04-04 14:09:22 -05:00
Matt Hill
4d9c955f36 Merge branch 'multithread' into develop
Conflicts:
	src/misc_utilities/CMakeLists.txt
	src/openalpr/CMakeLists.txt
	src/openalpr/alpr_impl.cpp
	src/openalpr/alpr_impl.h
	src/openalpr/config.cpp
	src/openalpr/config.h
2014-04-04 14:09:00 -05:00
Matt Hill
ec8fdc8aad Revert "Using multiple instances of OCR and state recognizer for multiple threads"
This reverts commit 29cb8fab21.
2014-04-04 13:58:53 -05:00
Philippe Vaucher
b548734fff Don't use "new" when it's not needed 2014-04-02 15:34:32 +02:00
Philippe Vaucher
526f777d6a Have country as command line argument 2014-04-02 15:29:24 +02:00
Philippe Vaucher
818d8a8309 Automate easy plates with 'W' 2014-03-31 10:04:01 +02:00
Matt Hill
1d92c1663d Added check to verify that file exists when input is given on standard in. If not, print an error message 2014-03-28 12:41:47 -05:00
Philippe Vaucher
d18e0e23b0 Only accept filenames in daemon 2014-03-28 16:15:03 +01:00
Philippe Vaucher
c62a76d6a8 Add daemon support 2014-03-28 10:10:49 +01:00
Matt Hill
0a41923da7 Masking characters from canny filter before doing the hough transform to detect plate edges.
This should reduce the noise a bit and get rid of spurious edges detected in the middle of the plate
2014-03-25 21:53:36 -05:00
Matt Hill
1a0b51d72f Removed code that unnecessarily eroded the character mask 2014-03-25 21:40:50 -05:00
Matt Hill
5a83b117f9 Merge branch 'develop' of https://github.com/Silex/openalpr into develop
Conflicts:
	src/openalpr/regiondetector.cpp
2014-03-24 20:45:13 -05:00
Matt Hill
b90566585a Added variable to control plate detection size increase.
Adjusting it to a smaller value means slower detection but higher probability that the plate will be found (and vice versa)
2014-03-24 10:10:55 -05:00
Philippe Vaucher
c406cc6e0b Fix weird boolean conditions 2014-03-24 12:48:55 +01:00
Philippe Vaucher
d24ed44f83 Add empty lines where it makes sense 2014-03-24 10:46:30 +01:00
Philippe Vaucher
4934cf59d2 Simplify verbose return 2014-03-24 10:46:30 +01:00
Philippe Vaucher
564e0d3087 Remove useless empty lines 2014-03-24 10:46:30 +01:00
Matthew Hill
420c6289b1 Merge pull request #15 from Silex/cleanup
Cleanup
2014-03-20 08:37:11 -05:00
Philippe Vaucher
7da25fc0df Cleanup & indent .h files 2014-03-19 11:44:13 +01:00
Philippe Vaucher
460205e943 Cleanup & reindent .cpp files 2014-03-19 11:34:43 +01:00
Philippe Vaucher
f2716dea1a Fix typo "characers" 2014-03-18 18:29:34 +01:00
Philippe Vaucher
38f83ef6e1 Convert files with windows line endings 2014-03-17 10:40:15 +01:00
Philippe Vaucher
bdc922c69a Remove trailing whitespace 2014-03-17 10:35:09 +01:00
Kristians Vebers
749366741e Removed findnegatves build rule from misc_utilities as source file is not found in repository 2014-02-25 23:24:14 +02:00
Matt Hill
9a9866e180 Merge branch 'develop' into multithread 2014-02-21 04:26:17 -06:00
Matt Hill
b86a6743de Incremented version 2014-02-21 04:19:29 -06:00
Matt Hill
4c02bc33ee Removed unused includes in main 2014-02-21 04:19:03 -06:00
Matt Hill
c0e937f9bc Cleaned up include statements 2014-02-21 04:18:02 -06:00
Matt Hill
29cb8fab21 Using multiple instances of OCR and state recognizer for multiple threads 2014-02-21 04:04:18 -06:00
Matt Hill
0b49374f81 Declared minimum opencv version at 2.4.8 (required for opencl) 2014-02-20 19:10:28 -06:00
Matt Hill
da610f9211 Merge branch 'develop' into multithread
Conflicts:
	src/openalpr/CMakeLists.txt
2014-02-20 18:28:53 -06:00
Matt Hill
21acb7084a Compiling tinythread as part of the openalpr source (rather than a separate library) 2014-02-20 18:17:02 -06:00
Matt Hill
bb39631acb Explicitly set OpenCV functions to single threading 2014-02-20 18:17:02 -06:00
Matt Hill
b5db3ea78a Added multithreading functions to detection 2014-02-20 18:17:02 -06:00
Matt Hill
0386bba299 Fixed multithreading library in CMakeLists 2014-02-20 18:17:01 -06:00
Matt Hill
ce907f5c34 Fixed typo in "multithreading_cores" preference 2014-02-20 18:17:01 -06:00
Matt Hill
35820e3b0f Added preference for multithreading_cores (controls number of threads spawned during recognition) 2014-02-20 18:17:01 -06:00
Matt Hill
cb6e266754 Added cmake config for tinythread 2014-02-20 18:17:01 -06:00
Matt Hill
33b349d219 Added tinythread x-platform multithreading library 2014-02-20 18:17:01 -06:00
Matt Hill
24dc807766 Updated cmake relative paths (simplified & removed boilerplate) 2014-02-20 18:15:26 -06:00
Matt Hill
f35ed4120c Removed errant tinythread.cpp reference 2014-02-20 18:14:27 -06:00
Matt Hill
f8f65dddee Using cmake to set the default runtime_dir (relative to the source path). 2014-02-20 18:09:09 -06:00
Matt Hill
73707ffcca Tweaked binarize functions to do integer multiplication rather than float -- slightly faster 2014-02-20 17:23:09 -06:00
Matt Hill
0aece1a3ac Print all the letters (debug output) in postprocess before pruning them 2014-02-19 19:38:23 -06:00
Matt Hill
cc3c4c7861 Updated postprocess permutation calculation to handle corner cases (topn = 1 and permutations == topn) 2014-02-19 18:17:35 -06:00
Matt Hill
a01d170495 Merge https://github.com/vebers/openalpr into develop 2014-02-19 18:13:02 -06:00
Matt Hill
34ebda3cfe Improved postprocess performance by pruning the characterset before sending to the recursive sort.
This uses the "topN" value to remove lower scoring characters that couldn't possibly show up in the topN results
2014-02-19 18:10:12 -06:00
Kristians Vebers
159f15c1d7 Fixed segfault on postProcess sort 2014-02-19 17:50:59 +02:00
Kristians Vebers
fee77e9aea Reversed segfault fix as it was already fixed 2014-02-19 10:09:38 +02:00
Kristians Vebers
7212cbb4a8 Merge commit 'bcdb010cc5fb469b593150979a020af4cda3698a' into develop 2014-02-19 09:55:55 +02:00