Merge branch 'ZhangXinNan-zxdev'

build.sh

@@ -32,3 +32,5 @@ fi
 if [ -f ${BUILD_BINARY_FULL_PATH} ];then
   cp ${BUILD_BINARY_FULL_PATH} ${BINARY_DIR}
 fi
+
+cp ${BUILD_BINARY_FULL_PATH} demo

include/easypr/core/plate_locate.h

@@ -63,6 +63,7 @@ class CPlateLocate {
     int img_index = 0, bool showDebug = false);
 
   int plateLocate(Mat, std::vector<Mat>&, int = 0);
+  int plateLocate(Mat, std::vector<CPlate>&, int = 0);
 
   bool verifySizes(RotatedRect mr);
 

result/accuracy.txt

@@ -2133,3 +2133,8 @@ Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%.
 Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%.
 0-error:60.4%,  1-error:71.6%,  Chinese-precise:73.2%  
 总时间:165秒,  平均执行时间:0.644531秒
+2016-08-02 20:33:58
+总图片数:256,  Plates count:297,  未定位车牌:29,  定位率:90.2357%  
+Recall:84.2263%, Precise:70.6573%, Fscore:76.8474%.
+0-error:60.4%,  1-error:71.6%,  Chinese-precise:73.2%  
+总时间:171秒,  平均执行时间:0.667969秒

src/core/plate_locate.cpp

@@ -1048,4 +1048,18 @@ int CPlateLocate::plateLocate(Mat src, vector<Mat> &resultVec, int index) {
   return 0;
 }
 
-}
+int CPlateLocate::plateLocate(Mat src, vector<CPlate> &resultVec, int index) {
+  vector<CPlate> all_result_Plates;
+
+  plateColorLocate(src, all_result_Plates, index);
+  plateSobelLocate(src, all_result_Plates, index);
+  plateMserLocate(src, all_result_Plates, index);
+
+  for (size_t i = 0; i < all_result_Plates.size(); i++) {
+    resultVec.push_back(all_result_Plates[i]);
+  }
+
+  return 0;
+}
+
+}