Skip to content

Commit 4f9ee6b

Browse files
OpenCV (win64) updated to 4.1.1
1 parent d89fe62 commit 4f9ee6b

7 files changed

+8
-8
lines changed

3rdparty/Versions.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Windows:
2626
- Link: https://www.transmissionzero.co.uk/software/freeglut-devel/
2727

2828
- OpenCV:
29-
- Version 4.0.1, extracted from their oficial website, section releases/4.0.1/Win pack.
30-
- Link: http://opencv.org/releases.html
29+
- Version 4.1.1, extracted from their oficial website: section `Releases`, subsection `OpenCV – 4.1.1`, `Windows` version.
30+
- Link: https://opencv.org/releases/
3131

3232
- Unzip:
3333
- Version 5.52.

3rdparty/windows/getOpenCV.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe
77
:: Download temporary zip
88
echo ----- Downloading OpenCV -----
99
SET OPENCV_FOLDER=opencv\
10-
SET ZIP_NAME=opencv_401_v14_15_2019_03_14.zip
10+
SET ZIP_NAME=opencv_411_v14_15_2019_09_24.zip
1111
SET ZIP_FULL_PATH=%OPENCV_FOLDER%%ZIP_NAME%
1212
%WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %OPENCV_FOLDER%
1313
echo:

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ if (WIN32)
554554
set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows")
555555

556556
# Download required zip files
557-
download_zip("opencv_401_v14_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} df8f611c032cfa86c56a8ad419f01832)
557+
download_zip("opencv_411_v14_15_2019_09_24.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} cf080121a8189ecb7f53ac9b0fef36c6)
558558
# download_zip("caffe3rdparty_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 34c49be6a2418fd1670b46fc455eebc0)
559559
download_zip("caffe3rdparty_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 9fcc6bdf4765db699d1a279c8d6b830b)
560560
if (${GPU_MODE} MATCHES "OPENCL")
@@ -572,7 +572,7 @@ if (WIN32)
572572

573573
# set(VS_VERSION "14")
574574
set(VS_VERSION "15") # Note: VS2017 code seems to simply works in VS2015
575-
find_library(OpenCV_LIBS opencv_world401 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/lib)
575+
find_library(OpenCV_LIBS opencv_world411 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${VS_VERSION}/lib)
576576
find_library(GFLAGS_LIBRARY_RELEASE gflags HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
577577
find_library(GFLAGS_LIBRARY_DEBUG gflagsd HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
578578
find_library(GLOG_LIBRARY_RELEASE glog HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)

doc/installation_deprecated.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Note: This installer will not incorporate any new features, we recommend to use
141141
- Dependencies:
142142
- [Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_15_2019_05_16.zip): Unzip as `3rdparty/windows/caffe/`.
143143
- [Caffe dependencies](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe3rdparty_15_2019_03_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`.
144-
- [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/`.
144+
- [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/`.
145145
2. Open the Visual Studio project sln file by double-cliking on `{openpose_path}\windows\OpenPose.sln`.
146146
3. In order to verify OpenPose is working, try compiling and executing the demo:
147147
1. Right click on `OpenPoseDemo` --> `Set as StartUp Project`.

doc/prerequisites.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ NOTE: These instructions are only required when compiling OpenPose brom source.
108108
- [CPU Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_cpu_2018_05_27.zip): Unzip as `3rdparty/windows/caffe_cpu/`.
109109
- [OpenCL Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_opencl_2018_02_13.zip): Unzip as `3rdparty/windows/caffe_opencl/`.
110110
- [Caffe dependencies](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe3rdparty_15_2019_03_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`.
111-
- [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/`.
111+
- [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/`.
112112
6. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration):
113113
- Enable the `WITH_EIGEN` flag when running CMake, and set it to `BUILD`.
114114
- CMake will automatically download Eigen.

doc/release_notes.md

+1
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ OpenPose Library - Release Notes
385385

386386
## Current version - Future OpenPose 1.5.2
387387
1. Main improvements:
388+
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.
388389
2. Functions or parameters renamed:
389390
3. Main bugs fixed:
390391
4. Changes/additions that affect the compatibility with the OpenPose Unity Plugin:

include/openpose/3d/jointAngleEstimation.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#ifdef USE_3D_ADAM_MODEL
99
#include <adam/totalmodel.h>
1010
#endif
11-
#include <opencv2/core/core.hpp>
1211
#include <openpose/core/common.hpp>
1312

1413
namespace op

0 commit comments

Comments
 (0)