add int plateLocate(Mat, std::vector<CPlate>&, int = 0);

liuruoze · Jul 22, 2016 · b57a269 · b57a269
1 parent 4bfa48f
commit b57a269
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 .idea/
 _build/
+bin/
+.vscode/
 resources/image/tmp/
 *.lib
 *.suo
@@ -38,4 +40,5 @@ _ReSharper*/
 *.obj
 *.cache
 *.log
+.DS_Store
 [Bb]in
diff --git a/bin/demo_darwin_amd64 b/bin/demo_darwin_amd64
diff --git a/bin/demo_linux_amd64 b/bin/demo_linux_amd64
diff --git a/include/easypr/core/plate_locate.h b/include/easypr/core/plate_locate.h
@@ -63,7 +63,7 @@ class CPlateLocate {
     int img_index = 0, bool showDebug = false);
 
   int plateLocate(Mat, std::vector<Mat>&, int = 0);
-  int plateLocate(Mat, std::vector<RotatedRect>&, int = 0);
+  int plateLocate(Mat, std::vector<CPlate>&, int = 0);
 
   bool verifySizes(RotatedRect mr);
 

diff --git a/src/core/plate_locate.cpp b/src/core/plate_locate.cpp
@@ -1048,16 +1048,15 @@ int CPlateLocate::plateLocate(Mat src, vector<Mat> &resultVec, int index) {
   return 0;
 }
 
-int CPlateLocate::plateLocate(Mat src, vector<RotatedRect> &resultVec, int index) {
+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++) {
-    CPlate plate = all_result_Plates[i];
-    resultVec.push_back(plate.getPlatePos());
+    resultVec.push_back(all_result_Plates[i]);
   }
 
   return 0;