diff --git a/.gitignore b/.gitignore index 00f1d65..fba478f 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ exe/FaceLandmarkImg/processed/ exe/FeatureExtraction/processed_features/ matlab_runners/Demos/processed_features/ *.db +exe/releases/OpenFace_0.3.0_win_x64/ +exe/releases/OpenFace_0.3.0_win_x86/ diff --git a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj index 832360d..38bc8fd 100644 --- a/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj +++ b/exe/FaceLandmarkImg/FaceLandmarkImg.vcxproj @@ -162,12 +162,14 @@ NotUsing Full true - true + false WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false AdvancedVectorExtensions true + AnySuitable + Speed Console diff --git a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj index 480dc6e..686cee8 100644 --- a/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj +++ b/exe/FaceLandmarkVid/FaceLandmarkVid.vcxproj @@ -164,16 +164,17 @@ Level3 NotUsing - MaxSpeed + Full - true + false WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false Speed AdvancedVectorExtensions true + AnySuitable Console diff --git a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj index 292c69f..d82f3dd 100644 --- a/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj +++ b/exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.vcxproj @@ -145,13 +145,15 @@ Level3 - MaxSpeed + Full true - true + false $(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) AdvancedVectorExtensions MultiThreadedDLL true + AnySuitable + Speed true diff --git a/exe/FeatureExtraction/FeatureExtraction.vcxproj b/exe/FeatureExtraction/FeatureExtraction.vcxproj index 0b72e06..cc9be52 100644 --- a/exe/FeatureExtraction/FeatureExtraction.vcxproj +++ b/exe/FeatureExtraction/FeatureExtraction.vcxproj @@ -163,9 +163,9 @@ Level3 NotUsing - MaxSpeed + Full false - true + false WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir)\lib\local\FaceAnalyser\include;$(SolutionDir)\lib\local\LandmarkDetector\include;$(SolutionDir)\lib\local\GazeAnalyser\include;$(SolutionDir)\lib\local\Utilities\include;%(AdditionalIncludeDirectories) false @@ -173,6 +173,7 @@ AdvancedVectorExtensions MultiThreadedDLL true + AnySuitable Console diff --git a/exe/releases/package_windows_executables.m b/exe/releases/package_windows_executables.m new file mode 100644 index 0000000..e8a8593 --- /dev/null +++ b/exe/releases/package_windows_executables.m @@ -0,0 +1,78 @@ +clear; +version = '0.3.0'; + +out_x86 = sprintf('OpenFace_%s_win_x86', version); +out_x64 = sprintf('OpenFace_%s_win_x64', version); + +mkdir(out_x86); +mkdir(out_x64); + +in_x86 = '../../Release/'; +in_x64 = '../../x64/Release/'; + +% Copy models +copyfile([in_x86, 'AU_predictors'], [out_x86, '/AU_predictors']) +copyfile([in_x86, 'classifiers'], [out_x86, '/classifiers']) +copyfile([in_x86, 'model'], [out_x86, '/model']) + +copyfile([in_x64, 'AU_predictors'], [out_x64, '/AU_predictors']) +copyfile([in_x64, 'classifiers'], [out_x64, '/classifiers']) +copyfile([in_x64, 'model'], [out_x64, '/model']) + +%% Copy libraries +libs_x86 = dir([in_x86, '*.lib'])'; + +for lib = libs_x86 + + copyfile([in_x86, '/', lib.name], [out_x86, '/', lib.name]) + +end + +libs_x64 = dir([in_x64, '*.lib'])'; + +for lib = libs_x64 + + copyfile([in_x64, '/', lib.name], [out_x64, '/', lib.name]) + +end + +%% Copy dlls +dlls_x86 = dir([in_x86, '*.dll'])'; + +for dll = dlls_x86 + + copyfile([in_x86, '/', dll.name], [out_x86, '/', dll.name]) + +end + +dlls_x64 = dir([in_x64, '*.dll'])'; + +for dll = dlls_x64 + + copyfile([in_x64, '/', dll.name], [out_x64, '/', dll.name]) + +end + +%% Copy exe's +exes_x86 = dir([in_x86, '*.exe'])'; + +for exe = exes_x86 + + copyfile([in_x86, '/', exe.name], [out_x86, '/', exe.name]) + +end + +exes_x64 = dir([in_x64, '*.exe'])'; + +for exe = exes_x64 + + copyfile([in_x64, '/', exe.name], [out_x64, '/', exe.name]) + +end + +%% Copy license and copyright +copyfile('../../Copyright.txt', [out_x86, '/Copyright.txt']); +copyfile('../../OpenFace-license.txt', [out_x86, '/OpenFace-license.txt']); + +copyfile('../../Copyright.txt', [out_x64, '/Copyright.txt']); +copyfile('../../OpenFace-license.txt', [out_x64, '/OpenFace-license.txt']); diff --git a/imgs/landmark_scheme_68.png b/imgs/landmark_scheme_68.png new file mode 100644 index 0000000..215fa6f Binary files /dev/null and b/imgs/landmark_scheme_68.png differ diff --git a/imgs/muticomp_logo_black.png b/imgs/muticomp_logo_black.png new file mode 100644 index 0000000..14004e4 Binary files /dev/null and b/imgs/muticomp_logo_black.png differ diff --git a/imgs/muticomp_logo_white.png b/imgs/muticomp_logo_white.png new file mode 100644 index 0000000..8e40748 Binary files /dev/null and b/imgs/muticomp_logo_white.png differ diff --git a/imgs/rainbow-logo.gif b/imgs/rainbow-logo.gif new file mode 100644 index 0000000..c8283a1 Binary files /dev/null and b/imgs/rainbow-logo.gif differ diff --git a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj index 50d78dd..8e04272 100644 --- a/lib/local/FaceAnalyser/FaceAnalyser.vcxproj +++ b/lib/local/FaceAnalyser/FaceAnalyser.vcxproj @@ -159,14 +159,16 @@ Level3 - MaxSpeed + Full true - true + false ./include;$(SolutionDir)lib\local\LandmarkDetector\include;$(SolutionDir)lib\local\Utilities\include;%(AdditionalIncludeDirectories) AdvancedVectorExtensions true + AnySuitable + Speed true diff --git a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj index 4e1a3ce..fbe4dbb 100644 --- a/lib/local/GazeAnalyser/GazeAnalyser.vcxproj +++ b/lib/local/GazeAnalyser/GazeAnalyser.vcxproj @@ -126,15 +126,17 @@ Level3 - MaxSpeed + Full true - true + false ./include;../LandmarkDetector/include;$(SolutionDir)lib\local\Utilities\include;%(AdditionalIncludeDirectories) true WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) AdvancedVectorExtensions + AnySuitable + Speed true diff --git a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj index a6c9ce6..dc9bfe3 100644 --- a/lib/local/LandmarkDetector/LandmarkDetector.vcxproj +++ b/lib/local/LandmarkDetector/LandmarkDetector.vcxproj @@ -165,7 +165,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.1\classifiers" "$(OutDir)c Full - true + false ./include;$(SolutionDir)lib\local\Utilities\include;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -178,6 +178,7 @@ xcopy /I /E /Y /D "$(SolutionDir)lib\3rdParty\OpenCV3.1\classifiers" "$(OutDir)c false /Zm300 %(AdditionalOptions) true + AnySuitable $(OutDir)$(TargetName)$(TargetExt) diff --git a/lib/local/Utilities/Utilities.vcxproj b/lib/local/Utilities/Utilities.vcxproj index 41dc0ed..5ec041f 100644 --- a/lib/local/Utilities/Utilities.vcxproj +++ b/lib/local/Utilities/Utilities.vcxproj @@ -135,11 +135,14 @@ Level3 - MaxSpeed - true - true + Full + + + false NDEBUG;_LIB;%(PreprocessorDefinitions) ./include;%(AdditionalIncludeDirectories) + Speed + AnySuitable Windows diff --git a/matlab_version/face_detection/mtcnn/test1.jpg b/matlab_version/face_detection/mtcnn/test1.jpg new file mode 100644 index 0000000..41c7563 Binary files /dev/null and b/matlab_version/face_detection/mtcnn/test1.jpg differ