Merge branch 'master' of https://github.com/micooz/EasyPR into v1.5dev

CMakeLists.txt

@@ -31,7 +31,7 @@ set(SOURCE_FILES
         src/core/plate_judge.cpp
         src/core/plate_locate.cpp
         src/core/plate_recognize.cpp
-        src/core/better_mser.cpp
+        src/core/params.cpp
 
         src/train/ann_train.cpp
         src/train/svm_train.cpp

test/accuracy.hpp

@@ -64,7 +64,7 @@ namespace easypr {
       return 0;
     }
 
-    int accuracyTest(const char* test_path, Result& result = Result(), bool useParams = false) {
+    int accuracyTest(const char* test_path, Result& result, bool useParams = false) {
       std::shared_ptr<easypr::Kv> kv(new easypr::Kv);
       kv->load("etc/chinese_mapping");
 

test/main.cpp

@@ -24,17 +24,19 @@ int accuracyTestMain() {
 
     int select = -1;
     bool isRepeat = true;
+    Result result;
+
     while (isRepeat) {
       std::cin >> select;
       isRepeat = false;
       switch (select) {
         case 1:
-          accuracyTest("resources/image/general_test");
+          accuracyTest("resources/image/general_test", result);
           break;
         case 2:
-          accuracyTest("resources/image/native_test");
+          accuracyTest("resources/image/native_test", result);
           break;
-        case 3:     
+        case 3:
           gridSearchTest("resources/image/general_test");
           break;
         case 4:
@@ -304,7 +306,8 @@ void command_line_handler(int argc, const char* argv[]) {
                  if (parser->has("batch")) {
                    // batch testing
                    auto folder = parser->get("path")->val();
-                   easypr::demo::accuracyTest(folder.c_str());
+                   easypr::demo::Result result;
+                   easypr::demo::accuracyTest(folder.c_str(), result);
                  } else {
                    // single testing
                    auto image = parser->get("path")->val();
@@ -388,7 +391,7 @@ int main(int argc, const char* argv[]) {
           }
           break;
         case 5:
-          easypr::preprocess::generate_gdts();       
+          easypr::preprocess::generate_gdts();
           break;
         case 6: {
           easypr::Utils::print_file_lines("etc/dev_team");

thirdparty/CMakeLists.txt

@@ -13,6 +13,7 @@ set(SOURCE_FILES
         textDetect/erfilter.cpp
         LBP/helper.cpp
         LBP/lbp.cpp
+        mser/mser2.cpp
         )
 
 # pack objects to static library