Merge branch 'micooz-master'

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+**I'm submitting a ...**  (check one with "x")
+
+```
+[ ] bug report
+[ ] help wanted
+[ ] feature request
+```
+
+**Current behavior**
+
+
+
+**Expected/desired behavior**
+
+
+
+**Reproduction of the problem**
+
+If the current behavior is a bug or you can illustrate your feature request better with an example, please provide the steps to reproduce.
+
+
+
+**What is the expected behavior?**
+
+
+
+**What is the motivation / use case for changing the behavior?**
+
+
+
+**Please tell us about your environment:**
+
+* **System:** CentOS
+
+* **Compiler version/IDE:** gcc4.8
+
+* **CMake version:** 3.5.1
+
+* **OpenCV version:** [2.4.9 | 2.4.10 | 2.4.11 | 2.4.12 | 2.4.13 | 3.0 ALPHA | 3.0 BETA | 3.0 RC1 | 3.0 | 3.1 ]

CMakeLists.txt

@@ -1,18 +1,9 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1.0)
 project(easypr)
 
 # c++11 required
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-
-if (COMPILER_SUPPORTS_CXX11)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif (COMPILER_SUPPORTS_CXX0X)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-else ()
-  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} doesn’t support C++11. Please upgrade or use a different C++ compiler.")
-endif ()
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/usr/local/opt/opencv3")

src/core/core_func.cpp

@@ -1194,7 +1194,7 @@ void searchWeakSeed(const std::vector<CCharacter>& charVec, std::vector<CCharact
 
 void slideWindowSearch(const Mat &image, std::vector<CCharacter>& slideCharacter, const Vec4f& line, 
   Point& fromPoint, const Vec2i& dist, double ostu_level, const Rect& maxrect, Rect& plateResult, 
-  CharSearchDirection searchDirection, bool isChinese, Mat& result = Mat()) {
+  CharSearchDirection searchDirection, bool isChinese, Mat& result) {
   float k = line[1] / line[0];
   float x_1 = line[2];
   float y_1 = line[3];

thirdparty/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1.0)
 project(thirdparty)
 
 # OpenVC3 required