mirror of
https://gitcode.com/gh_mirrors/ope/OpenFace.git
synced 2026-05-13 02:42:30 +00:00
Merge remote-tracking branch 'origin/feature/mtcnn_face_det' into feature/CE-CLM # Conflicts: # exe/FaceLandmarkImg/FaceLandmarkImg.cpp # exe/FaceLandmarkVid/FaceLandmarkVid.cpp # exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp # exe/FeatureExtraction/FeatureExtraction.cpp # lib/local/LandmarkDetector/LandmarkDetector.vcxproj # lib/local/LandmarkDetector/LandmarkDetector.vcxproj.filters # lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp # lib/local/LandmarkDetector/src/LandmarkDetectorParameters.cpp # lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
9.0 KiB
9.0 KiB