diff --git a/CMakeLists.txt b/CMakeLists.txt index 74500cd3..32c0dd42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 2.8.12) project(opencv_apps) ## https://stackoverflow.com/questions/10984442/how-to-detect-c11-support-of-a-compiler-with-cmake diff --git a/launch/face_detection.launch b/launch/face_detection.launch index d0c9d8aa..abf1846a 100644 --- a/launch/face_detection.launch +++ b/launch/face_detection.launch @@ -3,8 +3,8 @@ - - + + @@ -12,27 +12,30 @@ + + + + + name="face_cascade_name" default="$(find opencv3)/../OpenCV-3.1.0-dev/haarcascades/haarcascade_frontalface_alt.xml" doc="Face detection cascade Filename" /> + name="eyes_cascade_name" default="$(find opencv3)/../OpenCV-3.1.0-dev/haarcascades/haarcascade_eye_tree_eyeglasses.xml" doc="Eye detection cascade Filename" /> + name="face_cascade_name" default="$(find opencv3)/../OpenCV-3.2.0-dev/haarcascades/haarcascade_frontalface_alt.xml" doc="Face detection cascade Filename" /> + name="eyes_cascade_name" default="$(find opencv3)/../OpenCV-3.2.0-dev/haarcascades/haarcascade_eye_tree_eyeglasses.xml" doc="Eye detection cascade Filename" /> + name="face_cascade_name" default="$(find opencv3)/../OpenCV-3.3.1-dev/haarcascades/haarcascade_frontalface_alt.xml" doc="Face detection cascade Filename" /> + name="eyes_cascade_name" default="$(find opencv3)/../OpenCV-3.3.1-dev/haarcascades/haarcascade_eye_tree_eyeglasses.xml" doc="Eye detection cascade Filename" /> + + + name="face_cascade_name" default="/usr/share/opencv4/haarcascades/haarcascade_frontalface_alt.xml" doc="Face detection cascade Filename" /> - - - + name="eyes_cascade_name" default="/usr/share/opencv4/haarcascades/haarcascade_eye_tree_eyeglasses.xml" doc="Eye detection cascade Filename" /> diff --git a/launch/face_recognition.launch b/launch/face_recognition.launch index 34853eaf..20e1f0c4 100644 --- a/launch/face_recognition.launch +++ b/launch/face_recognition.launch @@ -2,7 +2,7 @@ - + diff --git a/test/test-face_detection.test b/test/test-face_detection.test index 063c5e31..c174ea4b 100644 --- a/test/test-face_detection.test +++ b/test/test-face_detection.test @@ -1,6 +1,6 @@ - + diff --git a/test/test-face_recognition.test b/test/test-face_recognition.test index d93f08d3..bb687f1b 100644 --- a/test/test-face_recognition.test +++ b/test/test-face_recognition.test @@ -1,6 +1,6 @@ - +