ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-16 12:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/opencv4 (#706)

Browse Source 
* Travis OpenCV4 update, testing Ubuntu with new OpenCV

* Fix to Ubuntu travis

* Another attempt at OpenCV 4.0 for Ubuntu

* And another OpenCV attempt.

* Simplifying the travis script

* Ubuntu OpenCV 4 support.

* Updating to OpenCV 4, for x64 windows.

* Fixes to move to OpenCV 4 on windows.

* Travis fix for OpenCV 4 on OSX

* Renaming a lib.

* Travis opencv4 fix.

* Building OpenCV4 versions using appveyor.

* Attempt mac travis fix.

* Small travis fix.

* Travis fix attempt.

* First iteration in boost removal and upgrade to C++17

* Test with ocv 4.0

* Moving filesystem out of stdafx

* Some more boost testing with cmake.

* More CMAKE options

* More compiler flag changes

* Another attempt at compiler options.

* Another attempt.

* More filesystem stuff.

* Linking to filesystem.

* Cmake fix with target linking.

* Attempting travis with g++-8

* Attempting to setup g++8 on travis linux.

* Another travis change.

* Adding OpenBLAS to travis and removing g++-8

* Fixing typo

* More travis experiments.

* More travis debugging.

* A small directory change.

* Adding some more travis changes.

* travis typo fix.

* Some reordering of travis, for cleaner yml

* Removing `using namespace std` in order to avoid clash with byte and to make the code more consistent.

* Working towards removing std::filesystem requirement, allow boost::filesystem as well.

* Making boost an optional dependency

* Fixing std issue.

* Fixing cmake issue.

* Fixing the precompiled header issue.

* Another cmake boost fix.

* Including missing files.

* Removing unnecessary includes.

* Removing more includes.

* Changes to appveyor build, proper removal of VS2015

* If boost is present, do not need to link to filesystem.

* Removing un-needed link library.

* oops

* Mac attempt at opencv4 travis.

* Upgrading OCV to 4.1 on VS2018

* Downloading OpenCV binaries through a script

* Triger an appveyor build.

* Upgrading VS version.

* Attempting VS2017 build

* Adding win-32 libraries for OpenCV 4.1

* Adding OpenCV 32 bit libraries.
This commit is contained in:
Tadas Baltrusaitis
2019-05-28 19:49:17 +01:00
committed by GitHub
parent 330383fef7
commit 9147dfe2f3
2762 changed files with 37401 additions and 353002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h
View File

@@ -38,8 +38,6 @@
#include <vector>
using namespace std;
namespace LandmarkDetector
{
@@ -59,20 +57,20 @@ struct FaceModelParameters
float validation_boundary;
// Used when tracking is going well
vector<int> window_sizes_small;
std::vector<int> window_sizes_small;
// Used when initialising or tracking fails
vector<int> window_sizes_init;
std::vector<int> window_sizes_init;
// Used for the current frame
vector<int> window_sizes_current;
std::vector<int> window_sizes_current;
// How big is the tracking template that helps with large motions
float face_template_scale;
bool use_face_template;
// Where to load the model from
string model_location;
std::string model_location;
// this is used for the smooting of response maps (KDE sigma)
float sigma;
@@ -95,8 +93,8 @@ struct FaceModelParameters
// MTCNN detector is much more accurate that the other two, and is even suitable for profile faces, but it is somewhat slower
enum FaceDetector{HAAR_DETECTOR, HOG_SVM_DETECTOR, MTCNN_DETECTOR};
string haar_face_detector_location;
string mtcnn_face_detector_location;
std::string haar_face_detector_location;
std::string mtcnn_face_detector_location;
FaceDetector curr_face_detector;
// Should the model be refined hierarchically (if available)
@@ -107,7 +105,7 @@ struct FaceModelParameters
FaceModelParameters();
FaceModelParameters(vector<string> &arguments);
FaceModelParameters(std::vector<std::string> &arguments);
private:
void init();