Merge branch 'Micooz-master-gbk'

hhh920406 · Apr 22, 2015 · 442cc12 · 442cc12
2 parents 06cb6a5 + a66f01f
commit 442cc12
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project (EasyPR)
 
-list(APPEND CMAKE_CXX_FLAGS "-std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 find_package(OpenCV REQUIRED)
 

diff --git a/run_accuracy.txt b/run_accuracy.txt
@@ -925,3 +925,7 @@
 ��ͼƬ��:120��,  δʶ��ͼƬ:1��,  ��λ��:99.1667%  
 ƽ���ַ����:0.714286��,  ��ȫƥ����:81��,  ��ȫƥ����:68.0672%  
 ��ʱ��:243��,  ƽ��ִ��ʱ��:2.025��  
+2015-04-22 17:39:09
+��ͼƬ��:120��,  δʶ��ͼƬ:1��,  ��λ��:99.1667%  
+ƽ���ַ����:0.714286��,  ��ȫƥ����:81��,  ��ȫƥ����:68.0672%  
+��ʱ��:251��,  ƽ��ִ��ʱ��:2.09167��  
diff --git a/src/core/plate_detect.cpp b/src/core/plate_detect.cpp
@@ -108,6 +108,7 @@ int CPlateDetect::plateDetectDeep(Mat src, vector<CPlate>& resultVec, bool showD
 		CPlate plate = all_result_Plates[i];
 		resultVec.push_back(plate);
 	}
+
 	return 0;
 }
 

diff --git a/src/core/plate_locate.cpp b/src/core/plate_locate.cpp
@@ -1583,8 +1583,9 @@ int CPlateLocate::plateLocate(Mat src, vector<Mat>& resultVec, int index)
 		//large the rect for more
 		if (!verifySizes(mr))
 		{
-			cv::Mat& roi = dst_blue(safeBoundRect);
+			cv::Mat roi = dst_blue(safeBoundRect);
 			roi.setTo(0);
+            cv::swap(roi, dst_blue);
 		}
 		else
 		{
@@ -1637,8 +1638,9 @@ int CPlateLocate::plateLocate(Mat src, vector<Mat>& resultVec, int index)
 		//large the rect for more
 		if (!verifySizes(mr))
 		{
-			cv::Mat& roi = dst_yellow(safeBoundRect);
+			cv::Mat roi = dst_yellow(safeBoundRect);
 			roi.setTo(0);
+            cv::swap(roi, dst_yellow);
 		}
 		else
 		{

diff --git a/src/test/test.cpp b/src/test/test.cpp
@@ -275,18 +275,19 @@ int test_plate_detect()
 
 	Mat src = imread("image/plate_detect.jpg");
 
-	vector<Mat> resultVec;
+	vector<CPlate> resultVec;
 	CPlateDetect pd;
 	pd.setPDLifemode(true);
 
-	int result = pd.plateDetect(src, resultVec);
+	int result = pd.plateDetectDeep(src, resultVec);
 	if (result == 0)
 	{
 		int num = resultVec.size();
 		for (int j = 0; j < num; j++)
 		{
-			Mat resultMat = resultVec[j];
-			imshow("plate_detect", resultMat);
+			CPlate resultMat = resultVec[j];
+
+			imshow("plate_detect", resultMat.getPlateMat());
 			waitKey(0);
 		}
 		destroyWindow("plate_detect");

diff --git a/src/util/learn_prepare.cpp b/src/util/learn_prepare.cpp
@@ -16,9 +16,9 @@
 using namespace easypr;
 
 //! 将以下路径改成你的位置
-char * notlabelPath = "F:/data/easypr-data/notlabel";
-char * hasPaltePath = "F:/data/easypr-data/learn/hasPlate/";
-char * noPlatePath = "F:/data/easypr-data/learn/noPlate/";
+const char * notlabelPath = "F:/data/easypr-data/notlabel";
+const char * hasPaltePath = "F:/data/easypr-data/learn/hasPlate/";
+const char * noPlatePath = "F:/data/easypr-data/learn/noPlate/";
 
 //! 读取not label data，生成learn data
 void label_data()

diff --git a/src/util/mc_data_prepare.cpp b/src/util/mc_data_prepare.cpp
@@ -242,7 +242,7 @@ void getLearnData()
 void changeFileName()
 {
     //char * filePath = "F:/data/easypr-data/learndata";
-    char * filePath = "F:/data/PlateLocate/pic1";
+    const char * filePath = "F:/data/PlateLocate/pic1";
 
     ////获取该路径下的所有文件
     auto files = Utils::getFiles(filePath);
-Original file line number
+Diff line change
@@ Expand Up @@
     		CPlate plate = all_result_Plates[i];
     		resultVec.push_back(plate);
     	}
     	return 0;
     }
@@ Expand Down @@