diff --git a/.gitignore b/.gitignore index a430510b..4337c949 100644 --- 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 deleted file mode 100755 index 733c288d..00000000 Binary files a/bin/demo_darwin_amd64 and /dev/null differ diff --git a/bin/demo_linux_amd64 b/bin/demo_linux_amd64 deleted file mode 100755 index 7da22989..00000000 Binary files a/bin/demo_linux_amd64 and /dev/null differ diff --git a/include/easypr/core/plate_locate.h b/include/easypr/core/plate_locate.h index 0f9edc7f..4eb89cae 100644 --- 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&, int = 0); - int plateLocate(Mat, std::vector&, int = 0); + int plateLocate(Mat, std::vector&, int = 0); bool verifySizes(RotatedRect mr); diff --git a/src/core/plate_locate.cpp b/src/core/plate_locate.cpp index a079657d..750d8dac 100644 --- a/src/core/plate_locate.cpp +++ b/src/core/plate_locate.cpp @@ -1048,7 +1048,7 @@ int CPlateLocate::plateLocate(Mat src, vector &resultVec, int index) { return 0; } -int CPlateLocate::plateLocate(Mat src, vector &resultVec, int index) { +int CPlateLocate::plateLocate(Mat src, vector &resultVec, int index) { vector all_result_Plates; plateColorLocate(src, all_result_Plates, index); @@ -1056,8 +1056,7 @@ int CPlateLocate::plateLocate(Mat src, vector &resultVec, int 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;