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
This commit is contained in:
Matt Hill
2014-04-04 14:09:00 -05:00
10 changed files with 1646 additions and 211 deletions

View File

@@ -14,6 +14,8 @@ max_plate_height_percent = 100
detection_iteration_increase = 1.1
opencl_enabled = 0
multithreading_cores = 1
ocr_min_font_point = 6