Commit graph

496 commits

Author SHA1 Message Date
Tadas Baltrusaitis
628427443f A quick layout fix. 2016-10-05 07:35:44 -04:00
Tadas Baltrusaitis
c23db4b5e8 Fixes to camera loading. 2016-10-04 21:14:41 -04:00
Tadas Baltrusaitis
8ce68ea6cd Work on solution. 2016-10-04 19:15:20 -04:00
Tadas Baltrusaitis
6a38145aa2 More work on the live demo. 2016-10-04 16:08:59 -04:00
Tadas Baltrusaitis
0a5110a003 Merge branch 'master' into Windows-GUI
Conflicts:
	.gitignore
	matlab_runners/Action Unit Experiments/DISFA_valid_res.txt
	matlab_runners/Feature Point Experiments/results/fps_yt.mat
	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
	matlab_runners/Gaze Experiments/mpii_1500_errs.txt
	matlab_runners/Head Pose Experiments/results/Pose_OF.mat
2016-10-03 18:11:05 -04:00
Tadas Baltrusaitis
f5cdec4829 Logo fix. 2016-10-03 17:45:27 -04:00
Guillaume Chanel
11031f5a36 Bug correction: FeatureExtraction file header corrected. 2016-09-16 10:49:18 +02:00
Tadas Baltrusaitis
235785298d Merge pull request #68 from Gijom/master
Added the possibility to change the output videos codec
2016-09-15 16:14:31 -04:00
Guillaume Chanel
358cd6f9e2 Added the possibility to change the output videos codec by specifying the -oc option
A warning is now issued in the case the VideoWriter could not be instantiated, advising to change the codec
This change applies to FaceLandmarkVid* and FeatureExtraction executables
The option is used as "-oc CODEC_FOURCC" and defaults to DIVX. If the user inputs a FOURCC with a size different than 4, than the default codec is used
The option is handled by the function get_video_input_output_params in the LandMarkDetector namespace
2016-09-14 09:00:57 +02:00
Tadas Baltrusaitis
f99870dfe9 Uploading bounding boxes. 2016-09-06 17:00:09 -04:00
Tadas Baltrusaitis
c1ff40399e Bug fixes 2016-09-06 12:32:33 -04:00
Tadas Baltrusaitis
1b804c95b6 Merge branch 'master' into develop 2016-09-06 10:37:03 -04:00
Tadas Baltrusaitis
4bbc662831 Merge pull request #61 from cyberjunk/master
Fix '=' compare in PDM.cpp
2016-09-06 10:36:17 -04:00
Tadas Baltrusaitis
96f9f5d06f Merge branch 'feature/logging' into develop 2016-09-06 10:26:10 -04:00
Tadas Baltrusaitis
c1431fe815 Fixes with drawing antialiased lines and landmarks using sub-pixel precision. 2016-09-06 10:20:31 -04:00
Clint Banzhaf
8a7c140e32 Fix '=' compare 2016-08-26 21:14:29 +02:00
Tadas Baltrusaitis
ef15d5c2cd Getting rid of compiler warnings. 2016-08-14 10:20:07 -04:00
Tadas Baltrusaitis
4c2e0bd9a0 Getting rid of some warnings. 2016-08-13 17:56:17 -04:00
Tadas Baltrusaitis
a48509f815 Small readme fix. 2016-08-13 15:29:13 -04:00
Tadas Baltrusaitis
a81f1d3223 Merge pull request #39 from Temigo/master
Fix install in CMakeLists.txt files
2016-08-04 14:13:33 -04:00
Tadas Baltrusaitis
5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
Tadas Baltrusaitis
2f667bf23d Ubuntu case sensitivity fix in travis test, making sure a check is made to see if image output is successful. 2016-08-01 10:14:58 -04:00
Temigo
eedf6ea37e Fix install in CMakeLists.txt files 2016-08-01 11:34:23 +02:00
Tadas Baltrusaitis
e88b788aed Fixes with test scripts. 2016-07-31 22:15:29 -04:00
Tadas Baltrusaitis
3fc388cdeb Fixes with -inroot and -outroot 2016-07-31 20:55:29 -04:00
Tadas Baltrusaitis
51ae195124 A number of small fixes, renamings and corrections. 2016-07-31 16:31:17 -04:00
Tadas Baltrusaitis
35f1967176 Fixing regexp. 2016-07-31 13:15:47 -04:00
Tadas Baltrusaitis
ce22058bf3 Making sure features get tested by CI. 2016-07-31 13:12:37 -04:00
Tadas Baltrusaitis
ee15ecbc46 More testing and prettier drawing on images (with anti-aliasing) 2016-07-31 13:11:14 -04:00
Tadas Baltrusaitis
0445a97b0c Merge branch 'feature-travis' into develop 2016-07-31 12:11:35 -04:00
Tadas Baltrusaitis
bb7ba5ba60 A fix to a previous fix - OpenCV does not handle Debug/Release mixing with writing out ,jpeg and .png files, so use .bmp instead 2016-07-31 10:09:35 -04:00
Tadas Baltrusaitis
a62de100e4 A fix to deal with OpenCV not liking to output png in Debug mode. Feature extraction now saves jpg instead of png for aligned face images. 2016-07-31 09:31:47 -04:00
Tadas Baltrusaitis
808a189525 Fixing the project configurations to create consistently named executables. 2016-07-30 21:14:38 -04:00
Tadas Baltrusaitis
fdf9973c59 appveyor yml fix. 2016-07-30 16:19:56 -04:00
Tadas Baltrusaitis
818ec6463e Adding appveyor testing. 2016-07-30 16:17:45 -04:00
Tadas Baltrusaitis
5f9d06a9f4 Better travis ci testing. 2016-07-30 15:51:07 -04:00
Tadas Baltrusaitis
38450d3383 A fix to travis tests. 2016-07-29 15:29:42 -04:00
Tadas Baltrusaitis
6eb3cd8c88 Fix travis testing. 2016-07-29 14:03:03 -04:00
Tadas Baltrusaitis
63a9adf13b Small fixes to windows and linux/osx CIs. 2016-07-29 13:26:03 -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
Tadas Baltrusaitis
777b31a822 Merge branch 'master' into develop 2016-07-29 12:13:15 -04:00
Tadas Baltrusaitis
004b1972d2 Some more fixes for osx and g++ 2016-07-29 11:43:58 -04:00
Tadas Baltrusaitis
a87509a2d5 Trying some fixes for travis osx 2016-07-29 11:18:06 -04:00
Tadas Baltrusaitis
f69971f6b3 Fixing some travis syntax 2016-07-29 10:40:51 -04:00
Tadas Baltrusaitis
d67d232cc2 Next attempt at osx with travis 2016-07-29 10:31:29 -04:00
Tadas Baltrusaitis
5a71c68e20 First attempt at osx support with travis. 2016-07-29 09:56:38 -04:00
Tadas Baltrusaitis
b6464e01fe Older version of clang 2016-07-27 18:40:30 -04:00
Tadas Baltrusaitis
b23393be0b g++ worked! Adding clang support. 2016-07-27 18:37:40 -04:00
Tadas Baltrusaitis
1fe91ca2dc Specific version of boost 2016-07-27 17:18:25 -04:00
Tadas Baltrusaitis
ba9d1e59af Forcing a yes 2016-07-27 16:49:32 -04:00