Commit Graph

127 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
ae1a8d038f Merging with master. 2018-11-28 20:42:18 +00:00
Tadas Baltrusaitis
126b34f181 Ability to specify output image formats and removing unused quiet parameter. 2018-11-04 13:10:28 +00:00
Tadas Baltrusaitis
91cb3f9c39 Updating OpenBLAS (#594)
Updating the 64 bit OpenBLAS version for Windows to 0.3.3 (50% perf improvement on certain machines)
2018-10-25 20:15:11 +01:00
Tadas Baltrusaitis
77eae16732 Removing TBB dependency (#590)
Removing a TBB dependence for code parallelization (done through OpenCV's parralel_for_
2018-10-20 10:45:35 +01:00
Tadas Baltrusaitis
be9b57703c A number of changes to bring up master to version 2.0.6 (#581)
- Removed duplicated code and some C++ warnings
- Fixing snapshot function in HeadPoseLive (test on PC)
- C++ code cleanup (https://github.com/TadasBaltrusaitis/OpenFace/issues/533, https://github.com/TadasBaltrusaitis/OpenFace/issues/534)
- Adding a Visual Studio 2017 solution file
- Moving to C++ OpenCV convention (thanks @taoyudong)
- Storing models in additional locations (see wiki and scripts) https://github.com/TadasBaltrusaitis/OpenFace/issues/553
2018-10-06 21:13:18 +01:00
Yudong Tao
9c2e5d6cba Update the OpenCV constants to the corresponding ones in cpp namespace. (#578)
Updating OpenCV macros.
2018-10-05 16:53:06 +01:00
Tadas Baltrusaitis
a274365998 Feature/code cleanup (#573)
* Header guard cleanup (making sure naming is compliant with C++ standards and consistent).

* Removing un-needed nullptr checks.

* Removing SSE warnings for x64 builds (as SSE is enabled by default no need for a flag)

* Reverting Mat deletion
2018-09-24 08:10:09 +01:00
Tadas Baltrusaitis
630aba9006 Removing code duplication and getting rid of some C++ warnings due to float/double and signed/unsigned mixing. 2018-09-18 08:24:16 +01:00
Tadas Baltrusaitis
2e56628ec7 - Do not use AVX instructions by default, switch all project settings to SSE2
- Removing .user project settings which should not be tracked
2018-08-20 08:16:44 +01:00
Bernhard
674d0743f8 fixed double/float mismatch 2018-08-10 17:06:03 +01:00
Tadas Baltrusaitis
6609388d05 Fixing some OpenCV namespaces and getting ready for OpenCV 4.0.0 2018-07-18 08:17:38 +01:00
Tadas Baltrusaitis
a48a54b98c Bug fix with bounding box computation and with Region of Interest for face validation. 2018-07-05 14:30:03 +01:00
Tadas Baltrusaitis
b214d6ba5d Trying again to remove compiler warnings. 2018-06-28 07:27:48 +02:00
Tadas Baltrusaitis
fcf6fbe0be Getting rid of OpenBLAS compilation warnings. 2018-06-28 06:57:09 +02:00
Tadas Baltrusaitis
7f16788c7b Removing another OpenBLAS include due to clashes with dlib 2018-06-25 16:43:36 +02:00
Tadas Baltrusaitis
842c0d34d0 Limiting includes to f77blas.h due to dlib clashes. 2018-06-25 16:19:26 +02:00
Tadas Baltrusaitis
d8ec8645dc Removing cblas.h include as that clashes with other cblas.h implementations (OpenBLAS seems to be different), this leads to clashes with dlib on OS X. 2018-06-25 13:02:15 +01:00
Tadas Baltrusaitis
079c282074 Trying to fix issues with OpenBLAS include 2018-06-22 19:23:54 +01:00
Tadas Baltrusaitis
a005e5b6ae Simplifying travis for OSX. 2018-06-22 17:07:05 +01:00
Tadas Baltrusaitis
361d1eb472 More openblas include changes. 2018-06-22 16:48:30 +01:00
Tadas Baltrusaitis
5e0ebf26f8 Attempt to force the use of OpenBLAS 2018-06-22 08:08:45 +01:00
Tadas Baltrusaitis
6aa8c83c7d Moving BLAS headers around 2018-06-21 22:10:53 +01:00
Tadas Baltrusaitis
014207aad0 Attempting to resolve issues with BLAS and dlib clashes. 2018-06-21 20:50:29 +01:00
Tadas Baltrusaitis
dbd921bd88 Attempting to move to modern cmake 2018-06-21 17:45:23 +01:00
Tadas Baltrusaitis
205f1ce689 Dlib update preparation for OSX and Ubuntu. 2018-06-18 16:28:14 +01:00
Tadas Baltrusaitis
cd24af000f Updating dlib and linking to it differently, increasing compilation speed and reducing dependency issues with it. 2018-06-08 16:48:21 +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
3cf21413e4 GUI bug fix with recording parameters.
Allowing for linking to BLAS in general rather than specifically OpenBLAS
2018-05-26 11:06:45 +01:00
Tadas Baltrusaitis
ade0e4ecc8 Numerical stability hotfix, attempt to fix travis CI for osx. 2018-05-26 08:59:11 +01:00
Tadas Baltrusaitis
881c10d49d Ability to not save bad aligned frames (saving space). FaceLandmarkVidMulti not copying the CEN patch experts to save space, allowing it to run on Win32. 2018-05-22 17:48:28 +01:00
Tadas Baltrusaitis
b99a53720b Bug fix with detection certainty. 2018-05-22 08:09:33 +01:00
Tadas Baltrusaitis
d190774285 Gcc compilation fix. 2018-05-20 18:40:08 +01:00
Tadas Baltrusaitis
15dd0e1b3f Simplifying response map computation for CEN experts. A minor speedup with grayscale image computation as float. 2018-05-19 23:32:39 +08:00
Tadas Baltrusaitis
63dd69c958 Bug fix with image and video output in the GUI. Memory assignment issues in GUI as well. 2018-05-17 11:57:07 +08:00
Tadas Baltrusaitis
07dffbb960 Further attempt at resolving OpenBLAS OS X travis issue. 2018-05-08 21:46:42 +01:00
Tadas Baltrusaitis
53018d09b5 Another attempt at a travis fix. 2018-05-08 21:21:10 +01:00
Tadas Baltrusaitis
67ad47912d Another attempt at OS X and blas/dlib fix. 2018-05-08 19:44:34 +01:00
Tadas Baltrusaitis
536d96e29a Removing some warnings and moving dlib includes before blas as there seems to be a double definition otherwise. 2018-05-08 19:15:16 +01:00
Tadas Baltrusaitis
74f42ed41a Removing some un-needed includes and removing some warnings. 2018-05-08 17:49:46 +01:00
Tadas Baltrusaitis
0a3b740591 Signed/unsigned int consistency. Attempt at travis dlib fix. 2018-05-07 22:15:40 +01:00
Tadas Baltrusaitis
e6849c6b52 Moving to AVX instead of AVX2, compiler warning fixes. Losing dependency on OpenCV C style bindings for affine warping. 2018-05-07 21:54:52 +01:00
Tadas Baltrusaitis
f6c29288f0 Fix to the OpenBLAS calls for not visual studio compilers. 2018-05-07 09:11:58 +01:00
Tadas Baltrusaitis
394b73efb7 Even more CI simplification. Fixing a warning caused by callig OpenBLAS with a string literal. 2018-05-06 22:07:58 +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
588285753c Adding the missing Multi-PIE CLNF patch experts. 2018-04-01 10:53:01 +01:00
Séverin Lemaignan
6b65d012a2 [LandmarkDetector] Make sure model paths are checked even when using FaceModelParameters default ctor 2018-03-20 14:30:37 +00:00
Tadas Baltrusaitis
aba6ea646b TBB removing unneeded headers and libs, also fixing some description of validators. 2018-02-14 17:27:04 +00:00
Tadas Baltrusaitis
bb7a5f197b Starting the move to OpenCV 3.4 2018-02-01 20:10:10 +00:00
Tadas Baltrusaitis
ffe2e66081 Visualization fixes. 2018-01-31 08:23:48 +00:00