From db3eaffe3807af3bb58f180c8c7560bc7f2c67f2 Mon Sep 17 00:00:00 2001
From: Derf00 <jahard@gmail.com>
Date: Wed, 4 Oct 2017 16:40:57 +0200
Subject: [PATCH] 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
---
 src/openpose/face/faceExtractor.cpp       | 2 +-
 src/openpose/hand/handExtractor.cpp       | 4 ++--
 windows/OpenPose/OpenPose.vcxproj         | 3 +++
 windows/OpenPose/OpenPose.vcxproj.filters | 9 +++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/openpose/face/faceExtractor.cpp b/src/openpose/face/faceExtractor.cpp
index a7c6787a..bba47efb 100644
--- a/src/openpose/face/faceExtractor.cpp
+++ b/src/openpose/face/faceExtractor.cpp
@@ -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();
diff --git a/src/openpose/hand/handExtractor.cpp b/src/openpose/hand/handExtractor.cpp
index 1a42c5df..195b8d0f 100644
--- a/src/openpose/hand/handExtractor.cpp
+++ b/src/openpose/hand/handExtractor.cpp
@@ -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
diff --git a/windows/OpenPose/OpenPose.vcxproj b/windows/OpenPose/OpenPose.vcxproj
index 03f042e1..e35c68de 100644
--- a/windows/OpenPose/OpenPose.vcxproj
+++ b/windows/OpenPose/OpenPose.vcxproj
@@ -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" />
diff --git a/windows/OpenPose/OpenPose.vcxproj.filters b/windows/OpenPose/OpenPose.vcxproj.filters
index e6260aff..e1adfd7e 100644
--- a/windows/OpenPose/OpenPose.vcxproj.filters
+++ b/windows/OpenPose/OpenPose.vcxproj.filters
@@ -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">