Commit Graph

8 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
ead2347581 Renaming everything to CEN in c++ 2017-06-12 20:11:42 -04:00
TadasBaltrusaitis
58daee692e Merge branch 'master' into feature/DCCNF
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
#	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
#	matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
2017-04-10 11:04:30 -04:00
TadasBaltrusaitis
5875786006 DCLM speed up. 2017-02-08 09:10:01 -05:00
Chris Watts
c334bf0ac3 Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake 2016-12-29 23:36:10 +00:00
Chris Watts
b33fe0730a Fix the make install process on Unix
Conflicts:
	.gitignore
2016-12-18 00:10:43 +00:00
Tadas Baltrusaitis
dbdf008f90 First C++ version of DCLM 2016-12-13 14:25:04 -05:00
Tadas Baltrusaitis
c1ff40399e Bug fixes 2016-09-06 12:32:33 -04:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00