OpenCV updated to 4.5 from 4.2

Signed-off-by: N Gines Hidalgo <gineshidalgo99@gmail.com>

OpenCV updated to 4.5 from 4.2
Signed-off-by: N Gines Hidalgo <gineshidalgo99@gmail.com>
3c4b284a · Gines Hidalgo · 8ca5c1d9 · 3c4b284a · 3c4b284a · 3c4b284a
15 changed file
--- a/3rdparty/Versions.txt
+++ b/3rdparty/Versions.txt
@@ -3,22 +3,22 @@ Asio:
    - Link: https://think-async.com/Asio/Download

 Eigen:
-    - Version 3.3.4 (15.06.2017)
+    - Version 3.3.4
    - Link: http://eigen.tuxfamily.org/index.php?title=Main_Page

 Unix:
    - Caffe:
-        - Version 1.0.0, extracted from GitHub on 04/26/2018 from the current master branch.
+        - Version 1.0.0, extracted from GitHub from its master branch.
        - Link: https://github.com/BVLC/caffe
        - GitHub SHA: 864520713a4c5ffae7382ced5d34e4cadc608473

    - Spinnaker:
-        - Tested on Spinnaker 1.13.0.31 SDK - Linux Ubuntu 16.04 (64-bit) — 05/25/2018 - 41.580MB.
+        - Tested on Spinnaker 1.13.0.31 SDK - Linux Ubuntu 16.04 (64-bit) - 05/25/2018 - 41.580MB.
        - Prerequisites: https://www.ptgrey.com/tan/10685

 Windows:
    - Caffe & Caffe dependencies (caffe3rdparty):
-        - Version 1.0.0, extracted from GitHub on 07/11/2017 from the current master branch.
+        - Version 1.0.0, extracted from GitHub from its master branch.
        - Link: https://github.com/BVLC/caffe/tree/windows

    - FreeGLUT (only for the 3-D reconstruction demo):
@@ -26,7 +26,7 @@ Windows:
        - Link: https://www.transmissionzero.co.uk/software/freeglut-devel/

    - OpenCV:
-        - Version 4.2.0, extracted from their oficial website: section `Releases`, subsection `OpenCV – 4.2.0`, `Windows` version.
+        - Version 4.5.0, extracted from their oficial website: section `Releases`, subsection `OpenCV - 4.5.0`, `Windows` version.
        - Link: https://opencv.org/releases/

    - Unzip:
@@ -34,5 +34,5 @@ Windows:
        - Link: http://stahlworks.com/dev/?tool=zipunzip

    - Wget:
-        - Version wget-1.19.1-win64.
+        - Version wget-1.20.3-win64.
        - Link: https://eternallybored.org/misc/wget/
--- 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_420_v14_15_2020_04_04.zip
+SET ZIP_NAME=opencv_450_v15_2020_11_18.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:

--- a/3rdparty/windows/wget/COPYING
+++ b/3rdparty/windows/wget/COPYING
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/3rdparty/windows/wget/Version_wget-1.19.1-win64.txt
+++ b/3rdparty/windows/wget/Version_wget-1.19.1-win64.txt
-Version wget-1.19.1-win64 from:
+Version wget-1.20.3-win64 from:
 - https://eternallybored.org/misc/wget/
--- a/3rdparty/windows/wget/wget.exe
+++ b/3rdparty/windows/wget/wget.exe
--- a/3rdparty/windows/wget/wget.exe.debug
+++ b/3rdparty/windows/wget/wget.exe.debug
--- a/3rdparty/windows/wget/wget.html
+++ b/3rdparty/windows/wget/wget.html
--- a/3rdparty/windows/wget/wget.ini.sample
+++ b/3rdparty/windows/wget/wget.ini.sample
-###
-### Sample Wget initialization file .wgetrc
-###
-
-## You can use this file to change the default behaviour of wget or to
-## avoid having to type many many command-line options. This file does
-## not contain a comprehensive list of commands -- look at the manual
-## to find out what you can put into this file. You can find this here:
-##   $ info wget.info 'Startup File'
-## Or online here:
-##   https://www.gnu.org/software/wget/manual/wget.html#Startup-File
-##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
-## (global, for all users) or $HOME/.wgetrc (for a single user).
-##
-## To use the settings in this file, you will have to uncomment them,
-## as well as change them, in most cases, as the values on the
-## commented-out lines are the default values (e.g. "off").
-##
-## Command are case-, underscore- and minus-insensitive.
-## For example ftp_proxy, ftp-proxy and ftpproxy are the same.
-
-
-##
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
-## Think well before you change them, since they may reduce wget's
-## functionality, and make it behave contrary to the documentation:
-##
-
-# You can set retrieve quota for beginners by specifying a value
-# optionally followed by 'K' (kilobytes) or 'M' (megabytes).  The
-# default quota is unlimited.
-#quota = inf
-
-# You can lower (or raise) the default number of retries when
-# downloading a file (default is 20).
-#tries = 20
-
-# Lowering the maximum depth of the recursive retrieval is handy to
-# prevent newbies from going too "deep" when they unwittingly start
-# the recursive retrieval.  The default is 5.
-#reclevel = 5
-
-# By default Wget uses "passive FTP" transfer where the client
-# initiates the data connection to the server rather than the other
-# way around.  That is required on systems behind NAT where the client
-# computer cannot be easily reached from the Internet.  However, some
-# firewalls software explicitly supports active FTP and in fact has
-# problems supporting passive transfer.  If you are in such
-# environment, use "passive_ftp = off" to revert to active FTP.
-#passive_ftp = off
-
-# The "wait" command below makes Wget wait between every connection.
-# If, instead, you want Wget to wait only between retries of failed
-# downloads, set waitretry to maximum number of seconds to wait (Wget
-# will use "linear backoff", waiting 1 second after the first failure
-# on a file, 2 seconds after the second failure, etc. up to this max).
-#waitretry = 10
-
-
-##
-## Local settings (for a user to set in his $HOME/.wgetrc).  It is
-## *highly* undesirable to put these settings in the global file, since
-## they are potentially dangerous to "normal" users.
-##
-## Even when setting up your own ~/.wgetrc, you should know what you
-## are doing before doing so.
-##
-
-# Set this to on to use timestamping by default:
-#timestamping = off
-
-# It is a good idea to make Wget send your email address in a `From:'
-# header with your request (so that server administrators can contact
-# you in case of errors).  Wget does *not* send `From:' by default.
-#header = From: Your Name <username@site.domain>
-
-# You can set up other headers, like Accept-Language.  Accept-Language
-# is *not* sent by default.
-#header = Accept-Language: en
-
-# You can set the default proxies for Wget to use for http, https, and ftp.
-# They will override the value in the environment.
-#https_proxy = http://proxy.yoyodyne.com:18023/
-#http_proxy = http://proxy.yoyodyne.com:18023/
-#ftp_proxy = http://proxy.yoyodyne.com:18023/
-
-# If you do not want to use proxy at all, set this to off.
-#use_proxy = on
-
-# You can customize the retrieval outlook.  Valid options are default,
-# binary, mega and micro.
-#dot_style = default
-
-# Setting this to off makes Wget not download /robots.txt.  Be sure to
-# know *exactly* what /robots.txt is and how it is used before changing
-# the default!
-#robots = on
-
-# It can be useful to make Wget wait between connections.  Set this to
-# the number of seconds you want Wget to wait.
-#wait = 0
-
-# You can force creating directory structure, even if a single is being
-# retrieved, by setting this to on.
-#dirstruct = off
-
-# You can turn on recursive retrieving by default (don't do this if
-# you are not sure you know what it means) by setting this to on.
-#recursive = off
-
-# To always back up file X as X.orig before converting its links (due
-# to -k / --convert-links / convert_links = on having been specified),
-# set this variable to on:
-#backup_converted = off
-
-# To have Wget follow FTP links from HTML files by default, set this
-# to on:
-#follow_ftp = off
-
-# To try ipv6 addresses first:
-#prefer-family = IPv6
-
-# Set default IRI support state
-#iri = off
-
-# Force the default system encoding
-#localencoding = UTF-8
-
-# Force the default remote server encoding
-#remoteencoding = UTF-8
-
-# Turn on to prevent following non-HTTPS links when in recursive mode
-#httpsonly = off
-
-# Tune HTTPS security (auto, SSLv2, SSLv3, TLSv1, PFS)
-#secureprotocol = auto
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -554,9 +554,7 @@ if (WIN32)
  set(OP_WIN_DIR "${CMAKE_SOURCE_DIR}/3rdparty/windows")

  # Download required zip files
-  download_zip("opencv_420_v14_15_2020_04_04.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 59da628c17fe0f4755d22ff86dbb8c06)
-  # 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("opencv_450_v15_2020_11_18.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} AFB1BD1A160C43CF5FB856C8BB4FC483)
  download_zip("caffe3rdparty_16_2020_11_14.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 83C17DC4473985B6AB3A29FD9AB93409)
  if (${GPU_MODE} MATCHES "OPENCL")
    download_zip("caffe_opencl_2018_02_13.zip" ${OP_WIN_URL} ${FIND_LIB_PREFIX} 3ac3e1acf5ee6a4e57920be73053067a)
@@ -573,8 +571,8 @@ if (WIN32)
  message(STATUS "Windows dependencies downloaded.")

  set(OPENCV_VS_VERSION "15")
-  find_library(OpenCV_LIBS_RELEASE opencv_world420 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_VS_VERSION}/lib)
-  find_library(OpenCV_LIBS_DEBUG opencv_world420d HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_VS_VERSION}/lib)
+  find_library(OpenCV_LIBS_RELEASE opencv_world450 HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_VS_VERSION}/lib)
+  find_library(OpenCV_LIBS_DEBUG opencv_world450d HINTS ${FIND_LIB_PREFIX}/opencv/x64/vc${OPENCV_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)

--- a/cmake/OpenPose.vcxproj.user
+++ b/cmake/OpenPose.vcxproj.user
@@ -2,13 +2,13 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

--- a/cmake/OpenPose_CL.vcxproj.user
+++ b/cmake/OpenPose_CL.vcxproj.user
@@ -2,13 +2,13 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_opencl\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_opencl\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_opencl\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_opencl\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

--- a/cmake/OpenPose_CPU.vcxproj.user
+++ b/cmake/OpenPose_CPU.vcxproj.user
@@ -2,13 +2,13 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc14\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=%PATH%;3rdparty\windows\caffe_cpu\bin\;3rdparty\windows\opencv\x64\vc15\bin;3rdparty\windows\freeglut\bin\;3rdparty\windows\spinnaker\bin\</LocalDebuggerEnvironment>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerWorkingDirectory>..\..\..</LocalDebuggerWorkingDirectory>
  </PropertyGroup>

--- 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_16_2020_11_14.zip): Unzip as `3rdparty/windows/caffe/`.
        - [Caffe dependencies](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/caffe3rdparty_16_2020_11_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`.
-        - [OpenCV 4.2.0](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_420_v14_15_2020_04_04.zip): Unzip as `3rdparty/windows/opencv/`.
+        - [OpenCV 4.2.0](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_450_v15_2020_11_18.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`.
@@ -150,7 +150,7 @@ Note: This installer will not incorporate any new features, we recommend to use
 4. If you have a webcam connected, OpenPose will automatically start after being compiled.
 5. In order to use the created exe file from the command line (i.e., outside Visual Studio), you have to:
    1. Copy all the DLLs located on `{openpose_folder}\3rdparty\windows\caffe\bin\` on the exe folder: `{openpose_folder}\windows\x64\Release`.
-    2. Copy all the DLLs located on `{openpose_folder}\3rdparty\windows\opencv\x64\vc14\bin\` on the exe folder: `{openpose_folder}\windows\x64\Release`.
+    2. Copy all the DLLs located on `{openpose_folder}\3rdparty\windows\opencv\x64\vc15\bin\` on the exe folder: `{openpose_folder}\windows\x64\Release`.
    3. Open the Windows cmd (Windows button + <kbd>X</kbd>, then <kbd>A</kbd>).
    4. Go to the OpenPose directory, assuming OpenPose has been downloaded on `C:\openpose`: `cd C:\openpose\`.
    5. Run the tutorial commands.

--- a/doc/prerequisites.md
+++ b/doc/prerequisites.md
@@ -106,7 +106,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_16_2020_11_14.zip): Unzip as `3rdparty/windows/caffe3rdparty/`.
-            - [OpenCV 4.2.0](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_420_v14_15_2020_04_04.zip): Unzip as `3rdparty/windows/opencv/`.
+            - [OpenCV 4.2.0](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/opencv_450_v15_2020_11_18.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.

--- a/doc/release_notes.md
+++ b/doc/release_notes.md
@@ -433,8 +433,13 @@ OpenPose Library - Release Notes

 ## Current version - Future OpenPose 1.7.1
 1. Main improvements:
+    1. Webcam speed boosted on Windows (by updating OpenCV).
+    2. Third party versions updated:
+        1. OpenCV: from 4.2 to 4.5.
+        2. `wget`: from 1.19.1 to 1.20.3.
 2. Functions or parameters renamed:
 3. Main bugs fixed:
+    1. Windows links to the right OpenCV DLL Files (v15, while it was linking to v14).