Adding debug dlland lib for openCV 3.4 and fixes for carriage returns on unix for AU names
This commit is contained in:
parent
186f478dfc
commit
27d00925ac
5 changed files with 4 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -88,3 +88,4 @@ exe/releases/OpenFace_0.3.0_win_x64/
|
|||
exe/releases/OpenFace_0.3.0_win_x86/
|
||||
lib/3rdParty/CameraEnumerator/x64/
|
||||
lib/local/Utilities/Debug/
|
||||
lib/3rdParty/CameraEnumerator/Debug/
|
||||
|
|
3
lib/3rdParty/OpenCV3.4/openCV3.4.props
vendored
3
lib/3rdParty/OpenCV3.4/openCV3.4.props
vendored
|
@ -9,10 +9,11 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\3rdParty\OpenCV3.4\$(PlatformTarget)\$(PlatformToolset)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>opencv_world340.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>opencv_world340.lib;opencv_world340d.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenCV3.4\$(PlatformTarget)\$(PlatformToolset)\bin\opencv_world340.dll" "$(OutDir)"
|
||||
xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenCV3.4\$(PlatformTarget)\$(PlatformToolset)\bin\opencv_world340d.dll" "$(OutDir)"
|
||||
xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenCV3.4\bin\opencv_ffmpeg340.dll" "$(OutDir)"
|
||||
xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenCV3.4\bin\opencv_ffmpeg340_64.dll" "$(OutDir)"
|
||||
xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenCV3.4\classifiers" "$(OutDir)classifiers"</Command>
|
||||
|
|
BIN
lib/3rdParty/OpenCV3.4/x64/v140/bin/opencv_world340d.dll
vendored
Normal file
BIN
lib/3rdParty/OpenCV3.4/x64/v140/bin/opencv_world340d.dll
vendored
Normal file
Binary file not shown.
BIN
lib/3rdParty/OpenCV3.4/x64/v140/lib/opencv_world340d.lib
vendored
Normal file
BIN
lib/3rdParty/OpenCV3.4/x64/v140/lib/opencv_world340d.lib
vendored
Normal file
Binary file not shown.
|
@ -1069,8 +1069,6 @@ void FaceAnalyser::Read(std::string model_loc)
|
|||
void FaceAnalyser::ReadAU(std::string au_model_location)
|
||||
{
|
||||
|
||||
|
||||
|
||||
// Open the list of the regressors in the file
|
||||
ifstream locations(au_model_location.c_str(), ios::in);
|
||||
|
||||
|
@ -1107,12 +1105,8 @@ void FaceAnalyser::ReadAU(std::string au_model_location)
|
|||
if(index >= 0)
|
||||
{
|
||||
name = name.substr(index+1);
|
||||
|
||||
// remove carriage return at the end for compatibility with unix systems
|
||||
if(name.size() > 0 && name.at(name.size()-1) == '\r')
|
||||
{
|
||||
name = name.substr(0, location.size()-1);
|
||||
}
|
||||
name.erase(name.find_last_not_of(" \n\r\t") + 1);
|
||||
}
|
||||
vector<string> au_names;
|
||||
boost::split(au_names, name, boost::is_any_of(","));
|
||||
|
|
Loading…
Reference in a new issue