Commit Graph

131 Commits

Author SHA1 Message Date
Tadas Baltrusaitis
ccd018ae65 Changing how filesystem includes are handled to support systems that have boost installed. (#738) 2019-07-08 17:09:21 +01:00
Sarfaraz Ghulam Iraqui
dc44e0f433 add missing header (#724)
Missing header in cmake.
2019-06-18 07:52:01 +01:00
Tadas Baltrusaitis
d37ec688ed Fixing output image bug, when processing data through the GUI. 2019-05-29 17:49:32 +01:00
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
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
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
6aed4e5e19 Fixing issue with -bboxdir searching in the wrong location. 2018-08-20 19:44:11 +01:00
Tadas Baltrusaitis
44f35af28b Merge remote-tracking branch 'origin/feature/avx-fixes' into develop 2018-08-20 15:34:11 +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
Tadas Baltrusaitis
0bfc42544b Not calling waitKey if no output is shown. 2018-08-20 08:08:50 +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
79d7116dae Bug fix with output aligned faces and videos if no face is detected in the first frame. Adding .webm file support 2018-06-29 09:57:45 +01:00
Tadas Baltrusaitis
feb6dbd25d Header mistake fix. 2018-06-25 19:53:01 +02:00
Tadas Baltrusaitis
2e265f0905 Some header cleanup 2018-06-25 17:15:17 +02:00
Tadas Baltrusaitis
2deab6cf42 Removing an unnecessary include. 2018-06-23 07:55:01 +01:00
Tadas Baltrusaitis
079c282074 Trying to fix issues with OpenBLAS include 2018-06-22 19:23:54 +01:00
Tadas Baltrusaitis
361d1eb472 More openblas include changes. 2018-06-22 16:48:30 +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
e52fe4e447 A bit of cleanup, also making sure that even for huge files, multi-threading would work. 2018-05-31 21:40:27 +01:00
Tadas Baltrusaitis
0517bbbd72 Separating threading on unix and windows systems. 2018-05-31 20:57:20 +01:00
Tadas Baltrusaitis
9b1db7321d More debugging. 2018-05-31 17:48:52 +01:00
Tadas Baltrusaitis
34067b0168 Debugging travis again. 2018-05-31 17:27:06 +01:00
Tadas Baltrusaitis
6569601652 CLR does not agree with C++ threads, so moving back to tbb task_group 2018-05-31 08:15:23 +01:00
Tadas Baltrusaitis
0d758babf8 A different way of threading output. 2018-05-30 20:13:47 +01:00
Tadas Baltrusaitis
2a371a46d8 Some more debugging. 2018-05-30 08:05:41 +01:00
Tadas Baltrusaitis
6f1489c812 Some more travis debugging. 2018-05-30 07:53:05 +01:00
Tadas Baltrusaitis
5683a79ad2 Another attempt at the travis fix. 2018-05-29 22:33:17 +01:00
Tadas Baltrusaitis
f3bdf085d5 More travis debugging. 2018-05-29 22:05:47 +01:00
Tadas Baltrusaitis
bc77974745 Another attempt to figure out why travis breaks. 2018-05-29 21:52:59 +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
e319620084 A bit less verbose. 2018-05-27 14:30:44 +01:00
Tadas Baltrusaitis
715783c29b A different way to output images and videos in a multi-threaded manner. 2018-05-27 13:53:45 +01:00
Tadas Baltrusaitis
d9079e9bb0 More error reporting for OSX issues. 2018-05-27 13:13:16 +01:00
Tadas Baltrusaitis
0291d182ff More error reporting for travis to find out the issue. 2018-05-27 11:51:10 +01:00
Tadas Baltrusaitis
c97fe6d85e Reporting if direcotry is missing. 2018-05-27 09:48:17 +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
67ad47912d Another attempt at OS X and blas/dlib fix. 2018-05-08 19:44:34 +01:00
Tadas Baltrusaitis
74f42ed41a Removing some un-needed includes and removing some warnings. 2018-05-08 17:49:46 +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
40a975c6c6 Getting rid of some compiler warnings. 2018-05-06 20:51:50 +01:00
Tadas Baltrusaitis
097d01fd3d Cleaning up includes. removing some C++ compilation warnings coming from dlib. 2018-05-06 20:46:18 +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