Fix windows compilation (#274)

* Fix VS 2015 windows compilation: conversion from 'const unsigned int' to 'int' requires a narrowing conversion

* Missing new source file faceDetectorOpenCV.cpp in VS 2015 projects

* Fix VS 2015 windows compilation: conversion from 'const unsigned int' to 'int' requires a narrowing conversion
This commit is contained in:
Derf00
2017-10-04 10:40:57 -04:00
committed by Gines
parent 4db8257519
commit db3eaffe38
4 changed files with 15 additions and 3 deletions
+1 -1
View File
@@ -128,7 +128,7 @@ namespace op
// HeatMaps: define size
if (!mHeatMapTypes.empty())
mHeatMaps.reset({numberPeople, FACE_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
mHeatMaps.reset({numberPeople, (int)FACE_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
// // Debugging
// cv::Mat cvInputDataCopy = cvInputData.clone();
+2 -2
View File
@@ -219,8 +219,8 @@ namespace op
// HeatMaps: define size
if (!mHeatMapTypes.empty())
{
mHeatMaps[0].reset({numberPeople, HAND_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
mHeatMaps[1].reset({numberPeople, HAND_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
mHeatMaps[0].reset({numberPeople, (int)HAND_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
mHeatMaps[1].reset({numberPeople, (int)HAND_NUMBER_PARTS, mNetOutputSize.y, mNetOutputSize.x});
}
// // Debugging
+3
View File
@@ -126,6 +126,7 @@
<ClInclude Include="..\..\include\openpose\experimental\producer\wPeoplePoseLoader.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceCpuRenderer.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceDetector.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceDetectorOpenCV.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceExtractor.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceGpuRenderer.hpp" />
<ClInclude Include="..\..\include\openpose\face\faceParameters.hpp" />
@@ -133,6 +134,7 @@
<ClInclude Include="..\..\include\openpose\face\headers.hpp" />
<ClInclude Include="..\..\include\openpose\face\renderFace.hpp" />
<ClInclude Include="..\..\include\openpose\face\wFaceDetector.hpp" />
<ClInclude Include="..\..\include\openpose\face\wFaceDetectorOpenCV.hpp" />
<ClInclude Include="..\..\include\openpose\face\wFaceExtractor.hpp" />
<ClInclude Include="..\..\include\openpose\face\wFaceRenderer.hpp" />
<ClInclude Include="..\..\include\openpose\filestream\cocoJsonSaver.hpp" />
@@ -259,6 +261,7 @@
<ClCompile Include="..\..\src\openpose\face\defineTemplates.cpp" />
<ClCompile Include="..\..\src\openpose\face\faceCpuRenderer.cpp" />
<ClCompile Include="..\..\src\openpose\face\faceDetector.cpp" />
<ClCompile Include="..\..\src\openpose\face\faceDetectorOpenCV.cpp" />
<ClCompile Include="..\..\src\openpose\face\faceExtractor.cpp" />
<ClCompile Include="..\..\src\openpose\face\faceGpuRenderer.cpp" />
<ClCompile Include="..\..\src\openpose\face\renderFace.cpp" />
@@ -500,6 +500,12 @@
<ClInclude Include="..\..\include\openpose\pose\wPoseRenderer.hpp">
<Filter>Header Files\pose</Filter>
</ClInclude>
<ClInclude Include="..\..\include\openpose\face\faceDetectorOpenCV.hpp">
<Filter>Header Files\face</Filter>
</ClInclude>
<ClInclude Include="..\..\include\openpose\face\wFaceDetectorOpenCV.hpp">
<Filter>Header Files\face</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\openpose\wrapper\defineTemplates.cpp">
@@ -733,6 +739,9 @@
<ClCompile Include="..\..\src\openpose\producer\webcamReader.cpp">
<Filter>Source Files\producer</Filter>
</ClCompile>
<ClCompile Include="..\..\src\openpose\face\faceDetectorOpenCV.cpp">
<Filter>Source Files\face</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\include\openpose\utilities\cuda.hu">