mirror of
https://gitcode.com/gh_mirrors/ope/OpenFace.git
synced 2026-07-22 12:57:48 +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
@@ -68,17 +68,15 @@ static void printErrorAndAbort(const std::string & error)
|
||||
#define FATAL_STREAM( stream ) \
|
||||
printErrorAndAbort( std::string( "Fatal error: " ) + stream )
|
||||
|
||||
using namespace std;
|
||||
|
||||
vector<string> get_arguments(int argc, char **argv)
|
||||
std::vector<std::string> get_arguments(int argc, char **argv)
|
||||
{
|
||||
|
||||
vector<string> arguments;
|
||||
std::vector<std::string> arguments;
|
||||
|
||||
// First argument is reserved for the name of the executable
|
||||
for (int i = 0; i < argc; ++i)
|
||||
{
|
||||
arguments.push_back(string(argv[i]));
|
||||
arguments.push_back(std::string(argv[i]));
|
||||
}
|
||||
return arguments;
|
||||
}
|
||||
@@ -86,13 +84,13 @@ vector<string> get_arguments(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
||||
vector<string> arguments = get_arguments(argc, argv);
|
||||
std::vector<std::string> arguments = get_arguments(argc, argv);
|
||||
|
||||
// no arguments: output usage
|
||||
if (arguments.size() == 1)
|
||||
{
|
||||
cout << "For command line arguments see:" << endl;
|
||||
cout << " https://github.com/TadasBaltrusaitis/OpenFace/wiki/Command-line-arguments";
|
||||
std::cout << "For command line arguments see:" << std::endl;
|
||||
std::cout << " https://github.com/TadasBaltrusaitis/OpenFace/wiki/Command-line-arguments";
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,7 +102,7 @@ int main(int argc, char **argv)
|
||||
|
||||
if (!face_model.loaded_successfully)
|
||||
{
|
||||
cout << "ERROR: Could not load the landmark detector" << endl;
|
||||
std::cout << "ERROR: Could not load the landmark detector" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -114,12 +112,12 @@ int main(int argc, char **argv)
|
||||
|
||||
if (!face_model.eye_model)
|
||||
{
|
||||
cout << "WARNING: no eye model found" << endl;
|
||||
std::cout << "WARNING: no eye model found" << std::endl;
|
||||
}
|
||||
|
||||
if (face_analyser.GetAUClassNames().size() == 0 && face_analyser.GetAUClassNames().size() == 0)
|
||||
{
|
||||
cout << "WARNING: no Action Unit models found" << endl;
|
||||
std::cout << "WARNING: no Action Unit models found" << std::endl;
|
||||
}
|
||||
|
||||
Utilities::SequenceCapture sequence_reader;
|
||||
@@ -158,7 +156,7 @@ int main(int argc, char **argv)
|
||||
Utilities::RecorderOpenFace open_face_rec(sequence_reader.name, recording_params, arguments);
|
||||
|
||||
if (recording_params.outputGaze() && !face_model.eye_model)
|
||||
cout << "WARNING: no eye model defined, but outputting gaze" << endl;
|
||||
std::cout << "WARNING: no eye model defined, but outputting gaze" << std::endl;
|
||||
|
||||
captured_image = sequence_reader.GetNextFrame();
|
||||
|
||||
@@ -240,10 +238,10 @@ int main(int argc, char **argv)
|
||||
// Reporting progress
|
||||
if (sequence_reader.GetProgress() >= reported_completion / 10.0)
|
||||
{
|
||||
cout << reported_completion * 10 << "% ";
|
||||
std::cout << reported_completion * 10 << "% ";
|
||||
if (reported_completion == 10)
|
||||
{
|
||||
cout << endl;
|
||||
std::cout << std::endl;
|
||||
}
|
||||
reported_completion = reported_completion + 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user