提交 4f9ee6b1 编写于 作者: G Gines Hidalgo

OpenCV (win64) updated to 4.1.1

上级 d89fe626
...@@ -26,8 +26,8 @@ Windows: ...@@ -26,8 +26,8 @@ Windows:
- Link: https://www.transmissionzero.co.uk/software/freeglut-devel/ - Link: https://www.transmissionzero.co.uk/software/freeglut-devel/
- OpenCV: - OpenCV:
- Version 4.0.1, extracted from their oficial website, section releases/4.0.1/Win pack. - Version 4.1.1, extracted from their oficial website: section `Releases`, subsection `OpenCV – 4.1.1`, `Windows` version.
- Link: http://opencv.org/releases.html - Link: https://opencv.org/releases/
- Unzip: - Unzip:
- Version 5.52. - Version 5.52.
......
...@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe ...@@ -7,7 +7,7 @@ SET WGET_EXE=wget\wget.exe
:: Download temporary zip :: Download temporary zip
echo ----- Downloading OpenCV ----- echo ----- Downloading OpenCV -----
SET OPENCV_FOLDER=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% 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% %WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %OPENCV_FOLDER%
echo: echo:
......
...@@ -554,7 +554,7 @@ if (WIN32) ...@@ -554,7 +554,7 @@ if (WIN32)
set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows") set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows")
# Download required zip files # 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_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) download_zip("caffe3rdparty_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 9fcc6bdf4765db699d1a279c8d6b830b)
if (${GPU_MODE} MATCHES "OPENCL") if (${GPU_MODE} MATCHES "OPENCL")
...@@ -572,7 +572,7 @@ if (WIN32) ...@@ -572,7 +572,7 @@ if (WIN32)
# set(VS_VERSION "14") # set(VS_VERSION "14")
set(VS_VERSION "15") # Note: VS2017 code seems to simply works in VS2015 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_RELEASE gflags HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
find_library(GFLAGS_LIBRARY_DEBUG gflagsd 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_RELEASE glog HINTS ${FIND_LIB_PREFIX}/caffe3rdparty/lib)
......
...@@ -141,7 +141,7 @@ Note: This installer will not incorporate any new features, we recommend to use ...@@ -141,7 +141,7 @@ Note: This installer will not incorporate any new features, we recommend to use
- Dependencies: - Dependencies:
- [Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_15_2019_05_16.zip): Unzip as `3rdparty/windows/caffe/`. - [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/`. - [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`. 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: 3. In order to verify OpenPose is working, try compiling and executing the demo:
1. Right click on `OpenPoseDemo` --> `Set as StartUp Project`. 1. Right click on `OpenPoseDemo` --> `Set as StartUp Project`.
......
...@@ -108,7 +108,7 @@ NOTE: These instructions are only required when compiling OpenPose brom source. ...@@ -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/`. - [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/`. - [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/`. - [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): 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`. - Enable the `WITH_EIGEN` flag when running CMake, and set it to `BUILD`.
- CMake will automatically download Eigen. - CMake will automatically download Eigen.
......
...@@ -385,6 +385,7 @@ OpenPose Library - Release Notes ...@@ -385,6 +385,7 @@ OpenPose Library - Release Notes
## Current version - Future OpenPose 1.5.2 ## Current version - Future OpenPose 1.5.2
1. Main improvements: 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: 2. Functions or parameters renamed:
3. Main bugs fixed: 3. Main bugs fixed:
4. Changes/additions that affect the compatibility with the OpenPose Unity Plugin: 4. Changes/additions that affect the compatibility with the OpenPose Unity Plugin:
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#ifdef USE_3D_ADAM_MODEL #ifdef USE_3D_ADAM_MODEL
#include <adam/totalmodel.h> #include <adam/totalmodel.h>
#endif #endif
#include <opencv2/core/core.hpp>
#include <openpose/core/common.hpp> #include <openpose/core/common.hpp>
namespace op namespace op
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册