Commit Graph

12 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
9147dfe2f3 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.
2019-05-28 19:49:17 +01:00
Tadas Baltrusaitis
cdecf902cd Updating licensing in source code files. More thorough travis tests. 2018-05-29 18:03:26 +01:00
Tadas Baltrusaitis
838337c760 Moving OpenFace 2.0 to develop branch and getting ready for master. 2018-05-06 08:19:09 +01:00
Tadas Baltrusaitis
bb7a5f197b Starting the move to OpenCV 3.4 2018-02-01 20:10:10 +00:00
Tadas Baltrusaitis
b224fcdfc9 Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	lib/local/FaceAnalyser/FaceAnalyser.vcxproj
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Demos/feature_extraction_demo_vid.m
#	matlab_runners/Demos/gaze_extraction_demo_vid.m
2017-12-29 16:27:00 +00:00
Tadas Baltrusaitis
b9378f8e5e Starting work on a separate recorder, this will allow for a nicer separation of executables and utilities and make it much easier to integrate with the GUI as it will not rely on it's own recorder. 2017-11-01 19:39:49 +00:00
Tadas Baltrusaitis
fa76d9051c Merge branch 'master' into feature/Windows-GUI
Conflicts:
	matlab_runners/Demos/feature_extraction_demo_vid.m
2017-05-15 13:19:11 -04:00
Tadas Baltrusaitis
305af01326 Auto stash before merge of "develop" and "origin/develop"
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Tadas Baltrusaitis
c23db4b5e8 Fixes to camera loading. 2016-10-04 21:14:41 -04:00
Tadas Baltrusaitis
5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
Tadas Baltrusaitis
242ce8d130 Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows. 2016-07-29 13:04:25 -04:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00