mirror of
https://gitcode.com/gh_mirrors/ope/OpenFace.git
synced 2026-05-18 13:18:11 +00:00
Feature/opencv4 (#706)
* 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:
committed by
GitHub
parent
330383fef7
commit
9147dfe2f3
@@ -36,14 +36,7 @@
|
||||
#ifndef FACE_ANALYSER_PARAM_H
|
||||
#define FACE_ANALYSER_PARAM_H
|
||||
|
||||
#include <vector>
|
||||
#include <opencv2/core/core.hpp>
|
||||
|
||||
// Boost includes
|
||||
#include <filesystem.hpp>
|
||||
#include <filesystem/fstream.hpp>
|
||||
|
||||
using namespace std;
|
||||
#include <stdafx_fa.h>
|
||||
|
||||
namespace FaceAnalysis
|
||||
{
|
||||
@@ -53,8 +46,8 @@ struct FaceAnalyserParameters
|
||||
public:
|
||||
// Constructors
|
||||
FaceAnalyserParameters();
|
||||
FaceAnalyserParameters(string root_exe);
|
||||
FaceAnalyserParameters(vector<string> &arguments);
|
||||
FaceAnalyserParameters(std::string root_exe);
|
||||
FaceAnalyserParameters(std::vector<std::string> &arguments);
|
||||
|
||||
// These are the parameters of training and will not change and are fixed
|
||||
const double sim_scale_au = 0.7;
|
||||
@@ -73,8 +66,8 @@ public:
|
||||
double getSimScaleOut() const { return sim_scale_out; }
|
||||
int getSimSizeOut() const { return sim_size_out; }
|
||||
bool getDynamic() const { return dynamic; }
|
||||
string getModelLoc() const { return string(model_location); }
|
||||
vector<cv::Vec3d> getOrientationBins() const { return vector<cv::Vec3d>(orientation_bins); }
|
||||
std::string getModelLoc() const { return std::string(model_location); }
|
||||
std::vector<cv::Vec3d> getOrientationBins() const { return std::vector<cv::Vec3d>(orientation_bins); }
|
||||
|
||||
private:
|
||||
|
||||
@@ -91,11 +84,11 @@ private:
|
||||
bool dynamic;
|
||||
|
||||
// Where to load the models from
|
||||
string model_location;
|
||||
std::string model_location;
|
||||
// The location of the executable
|
||||
boost::filesystem::path root;
|
||||
fs::path root;
|
||||
|
||||
vector<cv::Vec3d> orientation_bins;
|
||||
std::vector<cv::Vec3d> orientation_bins;
|
||||
|
||||
};
|
||||
|
||||
|
||||
57
lib/local/FaceAnalyser/include/stdafx_fa.h
Normal file
57
lib/local/FaceAnalyser/include/stdafx_fa.h
Normal file
@@ -0,0 +1,57 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2017, Carnegie Mellon University and University of Cambridge,
|
||||
// all rights reserved.
|
||||
//
|
||||
// ACADEMIC OR NON-PROFIT ORGANIZATION NONCOMMERCIAL RESEARCH USE ONLY
|
||||
//
|
||||
// BY USING OR DOWNLOADING THE SOFTWARE, YOU ARE AGREEING TO THE TERMS OF THIS LICENSE AGREEMENT.
|
||||
// IF YOU DO NOT AGREE WITH THESE TERMS, YOU MAY NOT USE OR DOWNLOAD THE SOFTWARE.
|
||||
//
|
||||
// License can be found in OpenFace-license.txt
|
||||
//
|
||||
|
||||
// Precompiled headers stuff
|
||||
|
||||
#ifndef __STDAFX_FA_h_
|
||||
#define __STDAFX_FA_h_
|
||||
|
||||
// OpenCV includes
|
||||
#include <opencv2/core/core.hpp>
|
||||
#include <opencv2/imgproc.hpp>
|
||||
#include <opencv2/objdetect.hpp>
|
||||
#include <opencv2/calib3d.hpp>
|
||||
#include <opencv2/imgcodecs.hpp>
|
||||
#include <opencv2/highgui/highgui.hpp>
|
||||
|
||||
// dlib dependencies for face detection
|
||||
#include <dlib/image_processing/frontal_face_detector.h>
|
||||
#include <dlib/opencv.h>
|
||||
|
||||
// C++ standard stuff
|
||||
#include <stdio.h>
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#define _USE_MATH_DEFINES
|
||||
#include <cmath>
|
||||
|
||||
// Filesystem stuff
|
||||
// It can either be in std filesystem (C++17), or in experimental/filesystem (partial C++17 support) or in boost
|
||||
#if __has_include(<filesystem>)
|
||||
#include <filesystem>
|
||||
namespace fs = std::filesystem;
|
||||
#elif __has_include(<experimental/filesystem>)
|
||||
#include <experimental/filesystem>
|
||||
namespace fs = std::filesystem;
|
||||
#else
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
namespace fs = boost::filesystem;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user