diff --git a/3rdparty/windows/getCaffe.bat b/3rdparty/windows/getCaffe.bat index 0bbeab7898af6e0fff9548a734e5eaff627111d8..e3d17ccdb3417be19f524f78d2afe24fd47a3da9 100644 --- a/3rdparty/windows/getCaffe.bat +++ b/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_15_2019_03_14.zip +SET ZIP_NAME=caffe_15_2019_05_16.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: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e75a2d0ff5265c06bb4cd0771c6fb4c0cf6f3c4..881e8667da3bb38a3a1bc17a3a5bbd1c405bea82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -554,7 +554,7 @@ if (WIN32) download_zip("caffe_cpu_2018_05_27.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 87E8401B6DFBAC5B8E909DD20E3B3390) else (${GPU_MODE} MATCHES "OPENCL") # download_zip("caffe_2019_03_12.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 859a592310f0928fd4f40da1456a217f) - download_zip("caffe_15_2019_03_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} f2d8beee9e4959fa419dcb54d507107c) + download_zip("caffe_15_2019_05_16.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} f2d8beee9e4959fa419dcb54d507107c) endif (${GPU_MODE} MATCHES "OPENCL") if (WITH_3D_RENDERER) download_zip("freeglut_2018_01_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} BB182187285E06880F0EDE3A39530091) diff --git a/doc/installation_deprecated.md b/doc/installation_deprecated.md index 094e9b314d325fd5ade5654bd4c0d1a3d2744c81..1df3a30befa2fe71375a8c25e9381bdba531ab85 100644 --- a/doc/installation_deprecated.md +++ b/doc/installation_deprecated.md @@ -139,7 +139,7 @@ Note: This installer will not incorporate any new features, we recommend to use - [Face model](http://posefs1.perception.cs.cmu.edu/OpenPose/models/face/pose_iter_116000.caffemodel): download in `models/face/`. - [Hands model](http://posefs1.perception.cs.cmu.edu/OpenPose/models/hand/pose_iter_102000.caffemodel): download in `models/hand/`. - Dependencies: - - [Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_15_2019_03_14.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/`. - [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/`. 2. Open the Visual Studio project sln file by double-cliking on `{openpose_path}\windows\OpenPose.sln`. diff --git a/doc/prerequisites.md b/doc/prerequisites.md index 9e03c94ae60d3cbc3dee236e669c58fc71a55502..0e9352fad588004d5a3be8606b7fcdd2cd44c610 100644 --- a/doc/prerequisites.md +++ b/doc/prerequisites.md @@ -98,7 +98,7 @@ NOTE: These instructions are only required when compiling OpenPose brom source. - CMake automatically downloads all the Windows DLLs. Alternatively, you might prefer to download them manually: - Dependencies: - Note: Leave the zip files in `3rdparty/windows/` so that CMake does not try to download them again. - - [Caffe](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe_15_2019_03_14.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/`. - [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/`. 6. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration): diff --git a/src/openpose/gui/gui3D.cpp b/src/openpose/gui/gui3D.cpp index 1ffeac0b30002743539573c01d2733cc28b25c3d..f5f4a3b98d6b43a1ce4f58adb923de09668e97a2 100644 --- a/src/openpose/gui/gui3D.cpp +++ b/src/openpose/gui/gui3D.cpp @@ -569,7 +569,11 @@ namespace op if (mCopyGlToCvMat) { image = cv::Mat(WINDOW_HEIGHT, WINDOW_WIDTH, CV_8UC3); - glReadPixels(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, GL_BGR, GL_UNSIGNED_BYTE, image.data); + #ifdef _WIN32 + glReadPixels(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, GL_BGR_EXT, GL_UNSIGNED_BYTE, image.data); + #else + glReadPixels(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, GL_BGR, GL_UNSIGNED_BYTE, image.data); + #endif cv::flip(image, image, 0); } } diff --git a/src/openpose/producer/spinnakerWrapper.cpp b/src/openpose/producer/spinnakerWrapper.cpp index c08257cb64126a18851fdabe59ef64898a0ba9bb..8cd746c100ac6d889fbe9f6787d40d64ccf85156 100644 --- a/src/openpose/producer/spinnakerWrapper.cpp +++ b/src/openpose/producer/spinnakerWrapper.cpp @@ -1,6 +1,10 @@ +#include // OPEN_CV_IS_4_OR_HIGHER #include #include #include // cv::undistort, cv::initUndistortRectifyMap +#ifdef OPEN_CV_IS_4_OR_HIGHER + #include // cv::initUndistortRectifyMap for OpenCV 4 +#endif #ifdef USE_FLIR_CAMERA #include #endif