Windows OP: now uses OpenCV 4 & webcam at 30FPS

3rdparty/windows/getCaffe.bat

@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe
 :: Download temporary zip
 echo ----- Downloading Caffe -----
 SET CAFEE_FOLDER=caffe\
-SET ZIP_NAME=caffe_2018_01_18.zip
+SET ZIP_NAME=caffe_2019_03_12.zip
 SET ZIP_FULL_PATH=%CAFEE_FOLDER%%ZIP_NAME%
 %WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %CAFEE_FOLDER%
 echo:

3rdparty/windows/getCaffe3rdparty.bat

@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe
 :: Download temporary zip
 echo ----- Downloading Caffe -----
 SET CAFEE_FOLDER=caffe3rdparty\
-SET ZIP_NAME=caffe3rdparty_2017_07_14.zip
+SET ZIP_NAME=caffe3rdparty_2019_03_12.zip
 SET ZIP_FULL_PATH=%CAFEE_FOLDER%%ZIP_NAME%
 %WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %CAFEE_FOLDER%
 echo:

3rdparty/windows/getOpenCV.bat

@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe
 :: Download temporary zip
 echo ----- Downloading OpenCV -----
 SET OPENCV_FOLDER=opencv\
-SET ZIP_NAME=opencv_310.zip
+SET ZIP_NAME=opencv_401_2019_03_12.zip
 SET ZIP_FULL_PATH=%OPENCV_FOLDER%%ZIP_NAME%
 %WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %OPENCV_FOLDER%
 echo:

3rdparty/windows/getSpinnaker.bat

+:: Avoid printing all the comments in the Windows cmd
+@echo off
+
+SET UNZIP_EXE=unzip\unzip.exe
+SET WGET_EXE=wget\wget.exe
+
+:: Download temporary zip
+echo ----- Downloading Caffe -----
+SET SPINNAKER_FOLDER=spinnaker\
+SET ZIP_NAME=spinnaker_2018_01_24.zip
+SET ZIP_FULL_PATH=%SPINNAKER_FOLDER%%ZIP_NAME%
+%WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %SPINNAKER_FOLDER%
+echo:
+
+echo ----- Unzipping Caffe -----
+%UNZIP_EXE% %ZIP_FULL_PATH%
+echo:
+
+:: echo ----- Deleting Temporary Zip File %ZIP_FULL_PATH% -----
+:: del "%ZIP_FULL_PATH%"
+
+echo ----- Caffe Downloaded and Unzipped -----

CMakeLists.txt

@@ -501,26 +501,26 @@ if (WIN32)
   set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows")
 
   # Download required zip files
-  download_zip("opencv_310.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 1e5240a64b814b3c0b822f136be78ad7)
-  download_zip("caffe3rdparty_2018_06_26.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 892A39C0CFBAA11CA8648B125852E01F)
+  download_zip("opencv_401_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 4da2ec29a18c120efe17aa2ef18c9637)
+  download_zip("caffe3rdparty_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 34c49be6a2418fd1670b46fc455eebc0)
   if (${GPU_MODE} MATCHES "OPENCL")
     download_zip("caffe_opencl_2018_02_13.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 3ac3e1acf5ee6a4e57920be73053067a)
   elseif (${GPU_MODE} MATCHES "CPU_ONLY")
     download_zip("caffe_cpu_2018_05_27.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 87E8401B6DFBAC5B8E909DD20E3B3390)
   else (${GPU_MODE} MATCHES "OPENCL")
-    download_zip("caffe_2018_01_18.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 4b8e548cc7ea20abea472950dd5301bd)
+    download_zip("caffe_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 859a592310f0928fd4f40da1456a217f)
   endif (${GPU_MODE} MATCHES "OPENCL")
   if (WITH_3D_RENDERER)
     download_zip("freeglut_2018_01_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} BB182187285E06880F0EDE3A39530091)
   endif (WITH_3D_RENDERER)
   message(STATUS "Windows dependencies downloaded.")
 
-  find_library(OpenCV_LIBS opencv_world310 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc14/lib)
+  find_library(OpenCV_LIBS opencv_world401 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc14/lib)
   find_library(GFLAGS_LIBRARY_RELEASE gflags HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
   find_library(GFLAGS_LIBRARY_DEBUG gflagsd HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
   find_library(GLOG_LIBRARY_RELEASE glog HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
   find_library(GLOG_LIBRARY_DEBUG glogd HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
-  find_library(OpenCV_LIBS opencv_world310 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc14/lib)
+  find_library(OpenCV_LIBS opencv_world401 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc14/lib)
 
   # If OpenPose builds it
   if (BUILD_CAFFE)

doc/release_notes.md

@@ -324,6 +324,7 @@ OpenPose Library - Release Notes
     32. Added Array `poseNetOutput` to Datum so that user can introduce his custom network output.
     33. OpenPose will never provoke a core dumped or crash. Exceptions in threads (`errorWorker()` instead of `error()`) lead to stopping the threads and reporting the error from the main thread, while exceptions in destructors (`errorDestructor()` instead of `error()`) are reported with std::cerr but not thrown as std::exceptions.
     34. When reading a directory of images, they will be sorted in natural order (rather than regular sort).
+    35. Upgraded OpenCV version for Windows from 3.1 to 4.0.1, which provides stable 30 FPS for webcams (vs. 10 FPS that OpenCV 3.1 provides by default on Windows).
 2. Functions or parameters renamed:
     1. By default, python example `tutorial_developer/python_2_pose_from_heatmaps.py` was using 2 scales starting at -1x736, changed to 1 scale at -1x368.
     2. WrapperStructPose default parameters changed to match those of the OpenPose demo binary.