Merge branch 'develop' into multithread

src/CMakeLists.txt

@@ -26,7 +26,7 @@ ENDIF()
 
 # Opencv Package
 FIND_PACKAGE( OpenCV REQUIRED )
-IF (${OpenCV_VERSION} VERSION_LESS 2.3.0)
+IF (${OpenCV_VERSION} VERSION_LESS 2.4.8)
 	MESSAGE(FATAL_ERROR "OpenCV version is not compatible : ${OpenCV_VERSION}")
 ENDIF()
 

src/main.cpp

@@ -20,9 +20,7 @@
 
 
  #include <iostream>
-#include <valarray>
  #include <stdio.h>
- #include <sys/stat.h>
 
  #include "opencv2/highgui/highgui.hpp"
  #include "opencv2/imgproc/imgproc.hpp"

src/openalpr/alpr.h

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <vector>
 
-#define OPENALPR_VERSION "0.3"
+#define OPENALPR_VERSION "1.0"
 
 struct AlprPlate
 {

src/openalpr/binarize_wolf.h

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <iostream>
 #include "opencv2/opencv.hpp"
-#include "opencv2/highgui/highgui.hpp"
 
 using namespace std;
 using namespace cv;

src/openalpr/characteranalysis.cpp

@@ -18,7 +18,6 @@
 */
 
 #include "characteranalysis.h"
-#include <math.h>
 
 CharacterAnalysis::CharacterAnalysis(Mat img, Config* config)
 {

src/openalpr/characteranalysis.h

@@ -22,7 +22,6 @@
 #ifndef CHARACTERANALYSIS_H
 #define CHARACTERANALYSIS_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "utility.h"

src/openalpr/characterregion.h

@@ -22,7 +22,6 @@
 #ifndef CHARACTERREGION_H
 #define CHARACTERREGION_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "utility.h"

src/openalpr/charactersegmenter.h

@@ -22,7 +22,6 @@
 #ifndef CHARACTERSEGMENTER_H
 #define CHARACTERSEGMENTER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "binarize_wolf.h"

src/openalpr/colorfilter.h

@@ -22,7 +22,6 @@
 #define COLORFILTER_H
 
 #include <iomanip>
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
 #include "constants.h"

src/openalpr/config.h

@@ -25,7 +25,7 @@
 #include "simpleini/simpleini.h"
 #include "support/filesystem.h"
 
-#include "linux_dev.h"
+#include "constants.h"
 
 #include <stdio.h>
 #include <iostream>

src/openalpr/constants.h

@@ -17,5 +17,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "linux_dev.h"
+#define CONFIG_FILE 		"/openalpr.conf"
+#define KEYPOINTS_DIR		"/keypoints"
+#define CASCADE_DIR		"/region/"
+#define POSTPROCESS_DIR		"/postprocess"
 
+#ifndef DEFAULT_RUNTIME_DIR
+  #define DEFAULT_RUNTIME_DIR 	"/default_runtime_data_dir/"
+#endif
+
+#define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR"

src/openalpr/featurematcher.h

@@ -23,7 +23,6 @@
 #ifndef FEATUREMATCHER_H
 #define FEATUREMATCHER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/features2d/features2d.hpp"

src/openalpr/licenseplatecandidate.h

@@ -24,11 +24,9 @@
 #include <iostream>
 #include <stdio.h>
 #include <vector>
-//#include <apr-1.0/apr_poll.h>
 
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
 
 #include "utility.h"
 #include "constants.h"

src/openalpr/linux_dev.h

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2013 New Designs Unlimited, LLC
- * Opensource Automated License Plate Recognition [http://www.openalpr.com]
- * 
- * This file is part of OpenAlpr.
- * 
- * OpenAlpr is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License 
- * version 3 as published by the Free Software Foundation 
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define CONFIG_FILE 		"/openalpr.conf"
-#define KEYPOINTS_DIR		"/keypoints"
-#define CASCADE_DIR		"/region/"
-#define POSTPROCESS_DIR		"/postprocess"
-
-#ifndef DEFAULT_RUNTIME_DIR
-  #define DEFAULT_RUNTIME_DIR 	"/default_runtime_data_dir/"
-#endif
-
-#define ENV_VARIABLE_RUNTIME_DIR "OPENALPR_RUNTIME_DIR"
-
-

src/openalpr/ocr.h

@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include "constants.h"
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
 #include "baseapi.h"

src/openalpr/platecorners.h

@@ -21,7 +21,6 @@
 #ifndef PLATECORNERS_H
 #define PLATECORNERS_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "characterregion.h"
 #include "platelines.h"

src/openalpr/platelines.h

@@ -26,7 +26,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "utility.h"
 #include "binarize_wolf.h"
-//#include "lswms.h"
 #include "config.h"
 
 using namespace cv;

src/openalpr/regiondetector.h

@@ -30,7 +30,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/core/core.hpp"
 #include "opencv2/ml/ml.hpp"
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/ocl/ocl.hpp"
 
 #include "utility.h"

src/openalpr/stateidentifier.h

@@ -22,7 +22,6 @@
 #ifndef STATEIDENTIFIER_H
 #define STATEIDENTIFIER_H
 
-#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "constants.h"
 #include "featurematcher.h"