Merge branch 'master-gbk' of https://github.com/Micooz/EasyPR into Micooz-master-gbk

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)
 

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
 		{

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()

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);