r
/
sustaining_gazes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Tadas Baltrusaitis 2016-09-06 10:37:03 -04:00
parent 96f9f5d06f 4bbc662831
commit 1b804c95b6
7 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

2
exe/FaceLandmarkImg/CMakeLists.txt
View File

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

2
exe/FaceLandmarkVid/CMakeLists.txt
View File

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

2
exe/FaceLandmarkVidMulti/CMakeLists.txt
View File

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

2
lib/local/FaceAnalyser/CMakeLists.txt
View File

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

2
lib/local/LandmarkDetector/CMakeLists.txt
View File

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

2
lib/local/LandmarkDetector/src/PDM.cpp
View File

@ -184,7 +184,7 @@ void PDM::CalcShape2D(cv::Mat_<double>& out_shape, const cv::Mat_<double>& param
cv::Mat_<double> 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);
}