diff --git a/3rdparty/Versions.txt b/3rdparty/Versions.txt index 48022f9ab4998a7680d35ff62488a6d7408866f8..76405ca63276bb6e85528f58d276dfbe89e8f8eb 100755 --- a/3rdparty/Versions.txt +++ b/3rdparty/Versions.txt @@ -26,8 +26,8 @@ Windows: - Link: https://www.transmissionzero.co.uk/software/freeglut-devel/ - OpenCV: - - Version 4.0.1, extracted from their oficial website, section releases/4.0.1/Win pack. - - Link: http://opencv.org/releases.html + - Version 4.1.1, extracted from their oficial website: section `Releases`, subsection `OpenCV – 4.1.1`, `Windows` version. + - Link: https://opencv.org/releases/ - Unzip: - Version 5.52. diff --git a/3rdparty/windows/getOpenCV.bat b/3rdparty/windows/getOpenCV.bat index 0f6c6bd3030d05952b17ffb17600890eee1fa86e..e42db8c4b647394ebf6d3ee299d32f64f7476550 100644 --- a/3rdparty/windows/getOpenCV.bat +++ b/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_401_v14_15_2019_03_14.zip +SET ZIP_NAME=opencv_411_v14_15_2019_09_24.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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fce7c5226d96e89eaf7ee872335c234a520f796..1915c60906f0291cd6eaba2ef06df5daa34a5e38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,7 +554,7 @@ if (WIN32) set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows") # Download required zip files - download_zip("opencv_401_v14_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} df8f611c032cfa86c56a8ad419f01832) + download_zip("opencv_411_v14_15_2019_09_24.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} cf080121a8189ecb7f53ac9b0fef36c6) # download_zip("caffe3rdparty_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 34c49be6a2418fd1670b46fc455eebc0) download_zip("caffe3rdparty_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 9fcc6bdf4765db699d1a279c8d6b830b) if (${GPU_MODE} MATCHES "OPENCL") @@ -572,7 +572,7 @@ if (WIN32) # set(VS_VERSION "14") set(VS_VERSION "15") # Note: VS2017 code seems to simply works in VS2015 - find_library(OpenCV_LIBS opencv_world401 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/lib) + find_library(OpenCV_LIBS opencv_world411 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/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) diff --git a/doc/installation_deprecated.md b/doc/installation_deprecated.md index 1df3a30befa2fe71375a8c25e9381bdba531ab85..0bec903d99037a9d4e6b9f3f4bbdf0ee1ad8609d 100644 --- a/doc/installation_deprecated.md +++ b/doc/installation_deprecated.md @@ -141,7 +141,7 @@ Note: This installer will not incorporate any new features, we recommend to use - Dependencies: - [Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_15_2019_05_16.zip): Unzip as `3rdparty/windows/caffe/`. - [Caffe dependencies](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe3rdparty_15_2019_03_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`. - - [OpenCV 4.0.1](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_401_v14_15_2019_03_14.zip): Unzip as `3rdparty/windows/opencv/`. + - [OpenCV 4.1.1](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_411_v14_15_2019_09_24.zip): Unzip as `3rdparty/windows/opencv/`. 2. Open the Visual Studio project sln file by double-cliking on `{openpose_path}\windows\OpenPose.sln`. 3. In order to verify OpenPose is working, try compiling and executing the demo: 1. Right click on `OpenPoseDemo` --> `Set as StartUp Project`. diff --git a/doc/prerequisites.md b/doc/prerequisites.md index 68f3cbb6eb10ce077ce98fcd678cb539f1e6073d..d0aec17a50b4e79d1cddd653abc5dc2031e69460 100644 --- a/doc/prerequisites.md +++ b/doc/prerequisites.md @@ -108,7 +108,7 @@ NOTE: These instructions are only required when compiling OpenPose brom source. - [CPU Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_cpu_2018_05_27.zip): Unzip as `3rdparty/windows/caffe_cpu/`. - [OpenCL Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_opencl_2018_02_13.zip): Unzip as `3rdparty/windows/caffe_opencl/`. - [Caffe dependencies](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe3rdparty_15_2019_03_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`. - - [OpenCV 4.0.1](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_401_v14_15_2019_03_14.zip): Unzip as `3rdparty/windows/opencv/`. + - [OpenCV 4.1.1](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_411_v14_15_2019_09_24.zip): Unzip as `3rdparty/windows/opencv/`. 6. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration): - Enable the `WITH_EIGEN` flag when running CMake, and set it to `BUILD`. - CMake will automatically download Eigen. diff --git a/doc/release_notes.md b/doc/release_notes.md index fbd737dc6ed814b840047b370206caa63d8a42b1..34e414ff2d3f442f4d61ccbe5766ea079198e7ba 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -385,6 +385,7 @@ OpenPose Library - Release Notes ## Current version - Future OpenPose 1.5.2 1. Main improvements: + 1. Default OpenCV version for Windows upgraded to version 4.1.1, extracted from their oficial website: section `Releases`, subsection `OpenCV – 4.1.1`, `Windows` version. 2. Functions or parameters renamed: 3. Main bugs fixed: 4. Changes/additions that affect the compatibility with the OpenPose Unity Plugin: diff --git a/include/openpose/3d/jointAngleEstimation.hpp b/include/openpose/3d/jointAngleEstimation.hpp index 63a6ec671aeff9cefe443410b8b5d5b7657a05f1..f274e8a087884129f3c8210a9f51588e5c5fecd1 100644 --- a/include/openpose/3d/jointAngleEstimation.hpp +++ b/include/openpose/3d/jointAngleEstimation.hpp @@ -8,7 +8,6 @@ #ifdef USE_3D_ADAM_MODEL #include #endif -#include #include namespace op