From eedf6ea37e165cc9f11f4145f54aa98d106830dd Mon Sep 17 00:00:00 2001 From: Temigo Date: Mon, 1 Aug 2016 11:34:23 +0200 Subject: [PATCH 1/3] Fix install in CMakeLists.txt files --- exe/FaceLandmarkImg/CMakeLists.txt | 2 +- exe/FaceLandmarkVid/CMakeLists.txt | 2 +- exe/FaceLandmarkVidMulti/CMakeLists.txt | 2 +- lib/local/FaceAnalyser/CMakeLists.txt | 2 +- lib/local/LandmarkDetector/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exe/FaceLandmarkImg/CMakeLists.txt b/exe/FaceLandmarkImg/CMakeLists.txt index 8ea140a..65097c9 100644 --- a/exe/FaceLandmarkImg/CMakeLists.txt +++ b/exe/FaceLandmarkImg/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(FaceLandmarkImg dlib) target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) -install (TARGETS FaceLandmarkImg DESTINATION ${CMAKE_BINARY_DIR}/bin) +install (TARGETS FaceLandmarkImg DESTINATION bin) diff --git a/exe/FaceLandmarkVid/CMakeLists.txt b/exe/FaceLandmarkVid/CMakeLists.txt index 6755fa1..5c5587f 100644 --- a/exe/FaceLandmarkVid/CMakeLists.txt +++ b/exe/FaceLandmarkVid/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(FaceLandmarkVid dlib) target_link_libraries(FaceLandmarkVid ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) -install (TARGETS FaceLandmarkVid DESTINATION ${CMAKE_BINARY_DIR}/bin) +install (TARGETS FaceLandmarkVid DESTINATION bin) diff --git a/exe/FaceLandmarkVidMulti/CMakeLists.txt b/exe/FaceLandmarkVidMulti/CMakeLists.txt index 7dabc9d..181db54 100644 --- a/exe/FaceLandmarkVidMulti/CMakeLists.txt +++ b/exe/FaceLandmarkVidMulti/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(FaceLandmarkVidMulti dlib) target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) -install (TARGETS FaceLandmarkVidMulti DESTINATION ${CMAKE_BINARY_DIR}/bin) +install (TARGETS FaceLandmarkVidMulti DESTINATION bin) diff --git a/lib/local/FaceAnalyser/CMakeLists.txt b/lib/local/FaceAnalyser/CMakeLists.txt index f0081e7..ce33450 100644 --- a/lib/local/FaceAnalyser/CMakeLists.txt +++ b/lib/local/FaceAnalyser/CMakeLists.txt @@ -30,4 +30,4 @@ include_directories(../LandmarkDetector/include) add_library( FaceAnalyser ${SOURCE} ${HEADERS}) install (TARGETS FaceAnalyser DESTINATION bin) -install (FILES HEADERS DESTINATION include) +install (FILES ${HEADERS} DESTINATION include) diff --git a/lib/local/LandmarkDetector/CMakeLists.txt b/lib/local/LandmarkDetector/CMakeLists.txt index 1c28678..a5e1a50 100644 --- a/lib/local/LandmarkDetector/CMakeLists.txt +++ b/lib/local/LandmarkDetector/CMakeLists.txt @@ -38,4 +38,4 @@ include_directories(${LandmarkDetector_SOURCE_DIR}/include) add_library( LandmarkDetector ${SOURCE} ${HEADERS}) install (TARGETS LandmarkDetector DESTINATION bin) -install (FILES HEADERS DESTINATION include) +install (FILES ${HEADERS} DESTINATION include) From a48509f8155f71c57d2da846eabced862b038574 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Sat, 13 Aug 2016 15:29:13 -0400 Subject: [PATCH 2/3] Small readme fix. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index ad9105e..015fc4e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # OpenFace: an open source facial behavior analysis toolkit -Travis [![Build Status](https://travis-ci.org/TadasBaltrusaitis/OpenFace.svg?branch=master)](https://travis-ci.org/TadasBaltrusaitis/OpenFace) -AppVeyor [![Build status](https://ci.appveyor.com/api/projects/status/8msiklxfbhlnsmxp/branch/master?svg=true)](https://ci.appveyor.com/project/TadasBaltrusaitis/openface/branch/master) Over the past few years, there has been an increased interest in automatic facial behavior analysis and understanding. We present OpenFace – an open source tool intended for computer vision and machine learning researchers, affective computing community and people interested in building interactive applications based on facial behavior analysis. OpenFace is the first open source tool capable of facial landmark detection, head pose estimation, facial action unit recognition, and eye-gaze estimation. The computer vision algorithms which represent the core of OpenFace demonstrate state-of-the-art results in all of the above mentioned tasks. Furthermore, our tool is capable of real-time performance and is able to run from a simple webcam without any specialist hardware. From 8a7c140e32be78adf039dc4be26adc280660efc3 Mon Sep 17 00:00:00 2001 From: Clint Banzhaf Date: Fri, 26 Aug 2016 21:14:29 +0200 Subject: [PATCH 3/3] Fix '=' compare --- lib/local/LandmarkDetector/src/PDM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/local/LandmarkDetector/src/PDM.cpp b/lib/local/LandmarkDetector/src/PDM.cpp index ab6e78e..ec4dda8 100644 --- a/lib/local/LandmarkDetector/src/PDM.cpp +++ b/lib/local/LandmarkDetector/src/PDM.cpp @@ -184,7 +184,7 @@ void PDM::CalcShape2D(cv::Mat_& out_shape, const cv::Mat_& param cv::Mat_ Shape_3D = mean_shape + princ_comp * params_local; // create the 2D shape matrix (if it has not been defined yet) - if((out_shape.rows != mean_shape.rows) || (out_shape.cols = 1)) + if((out_shape.rows != mean_shape.rows) || (out_shape.cols != 1)) { out_shape.create(2*n,1); }