diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..53565beb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM thiagofalcao/opencv3 +ADD https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.sh /usr/local/ +RUN cd /usr/local && sh cmake-3.8.0-Linux-x86_64.sh --skip-license --exclude-subdir && rm -f cmake-3.8.0-Linux-x86_64.sh +ADD . /data/easypr +RUN cd /data/easypr && ./build.sh diff --git a/src/core/chars_identify.cpp b/src/core/chars_identify.cpp index ac93af65..df5f463e 100644 --- a/src/core/chars_identify.cpp +++ b/src/core/chars_identify.cpp @@ -17,8 +17,8 @@ namespace easypr { } CharsIdentify::CharsIdentify() { - ann_ = ml::ANN_MLP::load(kDefaultAnnPath); - annChinese_ = ml::ANN_MLP::load(kChineseAnnPath); + ann_ = ml::ANN_MLP::load(kDefaultAnnPath); + annChinese_ = ml::ANN_MLP::load(kChineseAnnPath); kv_ = std::shared_ptr(new Kv); kv_->load("etc/province_mapping"); } @@ -29,7 +29,7 @@ namespace easypr { if (!ann_->empty()) ann_->clear(); - ann_ = ml::ANN_MLP::load(path); + ann_ = ml::ANN_MLP::load(path); } } @@ -39,7 +39,7 @@ namespace easypr { if (!annChinese_->empty()) annChinese_->clear(); - annChinese_ = ml::ANN_MLP::load(path); + annChinese_ = ml::ANN_MLP::load(path); } } diff --git a/src/core/plate_judge.cpp b/src/core/plate_judge.cpp index cf093468..c0d52bf2 100644 --- a/src/core/plate_judge.cpp +++ b/src/core/plate_judge.cpp @@ -15,8 +15,8 @@ namespace easypr { } PlateJudge::PlateJudge() { - svm_ = ml::SVM::load(kDefaultSvmPath); - //svm_ = ml::SVM::load(kLBPSvmPath); + svm_ = ml::SVM::load(kDefaultSvmPath); + //svm_ = ml::SVM::load(kLBPSvmPath); extractFeature = getLBPFeatures; } @@ -26,7 +26,7 @@ namespace easypr { if (!svm_->empty()) svm_->clear(); - svm_ = ml::SVM::load(path); + svm_ = ml::SVM::load(path); } } diff --git a/src/train/svm_train.cpp b/src/train/svm_train.cpp index ba396278..289bb12f 100644 --- a/src/train/svm_train.cpp +++ b/src/train/svm_train.cpp @@ -54,7 +54,7 @@ void SvmTrain::train() { void SvmTrain::test() { // 1.4 bug fix: old 1.4 ver there is no null judge // if (NULL == svm_) - svm_ = cv::ml::SVM::load(svm_xml_); + svm_ = cv::ml::SVM::load(svm_xml_); if (test_file_list_.empty()) { this->prepare();