Merge branch 'master' of https://github.com/liuruoze/EasyPR into master-gbk
# Conflicts:
# .gitignore
# ChangeLog.md
# EasyPR.vcxproj
# EasyPR.vcxproj.filters
# README.md
# doc/ChangeLog.md
# image/general_test/皖A2F560.jpg
# image/general_test/皖A2F56D.jpg
# image/general_test/皖AA3610.jpg
# image/general_test/皖AA361D.jpg
# image/general_test/赣A88888.jpg
# image/浙A88888.jpg
# opencv248.props
# resources/doc/ChangeLog.md
# resources/image/general_test/京H99999.jpg
# resources/image/general_test/皖A2F56D.jpg
# resources/image/general_test/皖AA361D.jpg
# resources/image/general_test/赣A88888.jpg
# run_accuracy.txt
# src/core/chars_identify.cpp
# src/core/chars_recognise.cpp
# src/core/chars_segment.cpp
# src/core/core_func.cpp
# src/core/feature.cpp
# src/core/plate_detect.cpp
# src/core/plate_judge.cpp
# src/core/plate_locate.cpp
# src/core/plate_recognize.cpp
# src/include/chars_identify.h
# src/include/chars_recognise.h
# src/include/chars_segment.h
# src/include/core_func.h
# src/include/plate.h
# src/include/plate_detect.h
# src/include/plate_judge.h
# src/include/plate_locate.h
# src/include/prep.h
# src/include/util.h
# src/test/accuracy_test.cpp
# src/test/test.cpp
|
Micooz