Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/tpys/face-everthing
# Conflicts: # CMakeLists.txt # cpp_modules/alignment/cl_alignment.h # cpp_modules/alignment/include/es/es_alignment.h # cpp_modules/alignment/include/lbf/lbf_alignment.h # cpp_modules/alignment/include/utils.h # cpp_modules/alignment/src/cln/LandmarkDetectorFunc.cpp # cpp_modules/alignment/src/cln/LandmarkDetectorModel.cpp # cpp_modules/alignment/src/cln/LandmarkDetectorUtils.cpp # cpp_modules/alignment/src/cln/PDM.cpp # cpp_modules/alignment/src/es/Fern.cpp # cpp_modules/alignment/src/es/FernCascade.cpp # cpp_modules/alignment/src/es/ShapeRegressor.cpp # cpp_modules/alignment/src/lbf/LBF.cpp # cpp_modules/detection/include/mtcnn/mtcnn.h # cpp_modules/detection/src/mtcnn/mtcnn.cpp # cpp_modules/example/mtcnn_align_dataset.cpp # cpp_modules/openpose/core/common.hpp # cpp_modules/openpose/core/macros.hpp # cpp_modules/openpose/core/maximumCaffe.cpp # cpp_modules/openpose/core/maximumCaffe.hpp # cpp_modules/openpose/core/netCaffe.cpp # cpp_modules/openpose/core/netCaffe.hpp # cpp_modules/openpose/core/resizeAndMergeCaffe.cpp # cpp_modules/openpose/core/resizeAndMergeCaffe.hpp # cpp_modules/openpose/face/faceParameters.hpp # cpp_modules/openpose/face/op_face.hpp # cpp_modules/recognition/cl_recognizer.h # cpp_modules/recognition/include/net_caffe.h # cpp_modules/tracking/CMakeLists.txt # cpp_modules/tracking/tracker.cpp # cpp_modules/tracking/tracker.hpp
- Loading branch information