Merge branch 'FuGangqiang-rename'

CMakeLists.txt

@@ -14,7 +14,7 @@ set(SOURCE_FILES
     src/core/chars_identify.cpp
     src/core/chars_recognise.cpp
     src/core/chars_segment.cpp
-    src/core/features.cpp
+    src/core/feature.cpp
     src/core/plate.cpp
     src/core/plate_detect.cpp
     src/core/plate_judge.cpp

EasyPR.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -91,7 +91,7 @@
     <ClCompile Include="src\core\chars_identify.cpp" />
     <ClCompile Include="src\core\chars_recognise.cpp" />
     <ClCompile Include="src\core\chars_segment.cpp" />
-    <ClCompile Include="src\core\features.cpp" />
+    <ClCompile Include="src\core\feature.cpp" />
     <ClCompile Include="src\core\plate.cpp" />
     <ClCompile Include="src\core\core_func.cpp" />
     <ClCompile Include="src\test\accuracy_test.cpp" />
@@ -116,7 +116,7 @@
     <ClInclude Include="src\include\chars_recognise.h" />
     <ClInclude Include="src\include\chars_segment.h" />
     <ClInclude Include="src\include\CParser.h" />
-    <ClInclude Include="src\include\features.h" />
+    <ClInclude Include="src\include\feature.h" />
     <ClInclude Include="src\include\plate.h" />
     <ClInclude Include="src\include\plate_detect.h" />
     <ClInclude Include="src\include\plate_judge.h" />

EasyPR.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="源文件">
@@ -60,7 +60,7 @@
     <ClCompile Include="src\core\plate_recognize.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="src\core\features.cpp">
+    <ClCompile Include="src\core\feature.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="src\test\test.cpp">
@@ -125,7 +125,7 @@
     <ClInclude Include="src\include\util.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="src\include\features.h">
+    <ClInclude Include="src\include\feature.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="src\include\CParser.h">

src/core/feature.cpp

@@ -3,7 +3,7 @@
 // 这个部分中的特征由easypr的开发者修改
 
 #include "../include/prep.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 #include "../include/core_func.h"
 
 /*! \namespace easypr

src/include/feature.h

@@ -1,5 +1,5 @@
-#ifndef __FEATURES_H__
+#ifndef __FEATURE_H__
-#define __FEATURES_H__
+#define __FEATURE_H__
 
 /*! \namespace easypr
     Namespace where all the C++ EasyPR functionality resides
@@ -33,4 +33,4 @@ namespace easypr {
 }	/*! \namespace easypr*/
 
 #endif
-/* endif __FEATURES_H__ */
+/* endif __FEATURE_H__ */

src/include/plate_judge.h

@@ -15,7 +15,7 @@
 
 #include "prep.h"
 #include "plate.h"
-#include "features.h"
+#include "feature.h"
 #include "core_func.h"
 
 /*! \namespace easypr

src/main.cpp

@@ -1,6 +1,6 @@
 #include "include/plate_recognize.h"
 #include "include/util.h"
-#include "include/features.h"
+#include "include/feature.h"
 #include "include/CParser.h"
 
 using namespace easypr;

src/test/accuracy_test.cpp

@@ -3,7 +3,7 @@
 
 #include "../include/plate_recognize.h"
 #include "../include/util.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 
 using namespace easypr;
 

src/train/ann_train.cpp

@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "../include/plate_recognize.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 #include "../include/util.h"
 
 using namespace easypr;

src/train/svm_train.cpp

@@ -1,7 +1,7 @@
 // svm_train.cpp : svm模型的训练文件，主要用在plate_detect中
 
 #include "../include/plate_recognize.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 #include "../include/util.h"
 
 /*! \namespace easypr

src/util/deface.cpp

@@ -21,7 +21,7 @@
 
 #include "../include/plate_recognize.h"
 #include "../include/util.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 
 using namespace std;
 using namespace cv;

src/util/general_test_prepare.cpp

@@ -4,7 +4,7 @@
 
 #include "../include/plate_recognize.h"
 #include "../include/util.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 
 using namespace easypr;
 

src/util/generate_gdts.cpp

@@ -5,7 +5,7 @@
 
 #include "../include/plate_recognize.h"
 #include "../include/util.h"
-#include "../include/features.h"
+#include "../include/feature.h"
 
 using namespace easypr;