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

Merge branch 'develop' into feature/Windows-GUI

Browse source
This commit is contained in:
Tadas Baltrusaitis 2017-10-26 08:06:18 +01:00
commit 271c076f41
9 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exe/FaceLandmarkImg/CMakeLists.txt
View file

@ -12,6 +12,6 @@ target_link_libraries(FaceLandmarkImg LandmarkDetector)
target_link_libraries(FaceLandmarkImg FaceAnalyser) target_link_libraries(FaceLandmarkImg FaceAnalyser)
target_link_libraries(FaceLandmarkImg dlib) target_link_libraries(FaceLandmarkImg dlib)
target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) target_link_libraries(FaceLandmarkImg ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
install (TARGETS FaceLandmarkImg DESTINATION bin) install (TARGETS FaceLandmarkImg DESTINATION bin)

2
exe/FaceLandmarkVid/CMakeLists.txt
View file

@ -14,6 +14,6 @@ target_link_libraries(FaceLandmarkVid FaceAnalyser)
target_link_libraries(FaceLandmarkVid dlib) target_link_libraries(FaceLandmarkVid dlib)
target_link_libraries(FaceLandmarkVid ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) target_link_libraries(FaceLandmarkVid ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
install (TARGETS FaceLandmarkVid DESTINATION bin) install (TARGETS FaceLandmarkVid DESTINATION bin)

2
exe/FaceLandmarkVidMulti/CMakeLists.txt
View file

@ -10,6 +10,6 @@ add_executable(FaceLandmarkVidMulti FaceLandmarkVidMulti.cpp)
target_link_libraries(FaceLandmarkVidMulti LandmarkDetector) target_link_libraries(FaceLandmarkVidMulti LandmarkDetector)
target_link_libraries(FaceLandmarkVidMulti dlib) target_link_libraries(FaceLandmarkVidMulti dlib)
target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) target_link_libraries(FaceLandmarkVidMulti ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
install (TARGETS FaceLandmarkVidMulti DESTINATION bin) install (TARGETS FaceLandmarkVidMulti DESTINATION bin)

2
exe/FeatureExtraction/CMakeLists.txt
View file

@ -13,6 +13,6 @@ target_link_libraries(FeatureExtraction LandmarkDetector)
target_link_libraries(FeatureExtraction FaceAnalyser) target_link_libraries(FeatureExtraction FaceAnalyser)
target_link_libraries(FeatureExtraction dlib) target_link_libraries(FeatureExtraction dlib)
target_link_libraries(FeatureExtraction ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES}) target_link_libraries(FeatureExtraction ${OpenCV_LIBS} ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${BLAS_LIBRARIES})
install (TARGETS FeatureExtraction DESTINATION bin) install (TARGETS FeatureExtraction DESTINATION bin)

6
lib/local/FaceAnalyser/CMakeLists.txt
View file

@ -4,6 +4,12 @@ include_directories(${BLAS_ROOT_DIR})
include_directories(${BOOST_INCLUDE_DIR}) include_directories(${BOOST_INCLUDE_DIR})
#OpenBlas library
include_directories(../../3rdParty/OpenBLAS/include)
#LandmarkDetector library
include_directories(../../local/LandmarkDetector/include)
SET(SOURCE SET(SOURCE
src/Face_utils.cpp src/Face_utils.cpp
src/FaceAnalyser.cpp src/FaceAnalyser.cpp

1
lib/local/FaceAnalyser/include/Face_utils.h
View file

@ -39,6 +39,7 @@
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>
#include "PDM.h" #include "PDM.h"
#include "PAW.h"
namespace FaceAnalysis namespace FaceAnalysis
{ {

4
lib/local/FaceAnalyser/include/PAW.h
View file

@ -32,8 +32,8 @@
// //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef __PAW_h_ #ifndef __PAWA_h_
#define __PAW_h_ #define __PAWA_h_
// OpenCV includes // OpenCV includes
#include <opencv2/core/core.hpp> #include <opencv2/core/core.hpp>

3
lib/local/FaceAnalyser/src/Face_utils.cpp
View file

@ -33,7 +33,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include <Face_utils.h> #include <Face_utils.h>
#include <PAW.h>
// OpenCV includes // OpenCV includes
#include <opencv2/core/core.hpp> #include <opencv2/core/core.hpp>
@ -217,7 +216,7 @@ namespace FaceAnalysis
destination_landmarks = cv::Mat(destination_landmarks.t()).reshape(1, 1).t(); destination_landmarks = cv::Mat(destination_landmarks.t()).reshape(1, 1).t();
PAW paw(destination_landmarks, triangulation, 0, 0, aligned_face.cols-1, aligned_face.rows-1); FaceAnalysis::PAW paw(destination_landmarks, triangulation, 0, 0, aligned_face.cols-1, aligned_face.rows-1);
// Mask each of the channels (a bit of a roundabout way, but OpenCV 3.1 in debug mode doesn't seem to be able to handle a more direct way using split and merge) // Mask each of the channels (a bit of a roundabout way, but OpenCV 3.1 in debug mode doesn't seem to be able to handle a more direct way using split and merge)
vector<cv::Mat> aligned_face_channels(aligned_face.channels()); vector<cv::Mat> aligned_face_channels(aligned_face.channels());

3
lib/local/LandmarkDetector/CMakeLists.txt
View file

@ -3,6 +3,9 @@ include_directories(${TBB_ROOT_DIR}/include)
include_directories(${BOOST_INCLUDE_DIR}) include_directories(${BOOST_INCLUDE_DIR})
#OpenBlas library
include_directories(../../3rdParty/OpenBLAS/include)
SET(SOURCE SET(SOURCE
src/CCNF_patch_expert.cpp src/CCNF_patch_expert.cpp
src/LandmarkDetectionValidator.cpp src/LandmarkDetectionValidator.cpp