diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake index 257af6fcc6..08cf091db3 100644 --- a/3rdparty/ippicv/ippicv.cmake +++ b/3rdparty/ippicv/ippicv.cmake @@ -2,32 +2,32 @@ function(download_ippicv root_var) set(${root_var} "" PARENT_SCOPE) # Commit SHA in the opencv_3rdparty repo - set(IPPICV_COMMIT "a56b6ac6f030c312b2dce17430eef13aed9af274") + set(IPPICV_COMMIT "1224f78da6684df04397ac0f40c961ed37f79ccb") # Define actual ICV versions if(APPLE) set(OPENCV_ICV_PLATFORM "macosx") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_mac") - set(OPENCV_ICV_NAME "ippicv_2020_mac_intel64_20191018_general.tgz") - set(OPENCV_ICV_HASH "1c3d675c2a2395d094d523024896e01b") + set(OPENCV_ICV_NAME "ippicv_2021.8_mac_intel64_20230330_general.tgz") + set(OPENCV_ICV_HASH "d2b234a86af1b616958619a4560356d9") elseif((UNIX AND NOT ANDROID) OR (UNIX AND ANDROID_ABI MATCHES "x86")) set(OPENCV_ICV_PLATFORM "linux") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_lnx") if(X86_64) - set(OPENCV_ICV_NAME "ippicv_2020_lnx_intel64_20191018_general.tgz") - set(OPENCV_ICV_HASH "7421de0095c7a39162ae13a6098782f9") + set(OPENCV_ICV_NAME "ippicv_2021.8_lnx_intel64_20230330_general.tgz") + set(OPENCV_ICV_HASH "43219bdc7e3805adcbe3a1e2f1f3ef3b") else() - set(OPENCV_ICV_NAME "ippicv_2020_lnx_ia32_20191018_general.tgz") - set(OPENCV_ICV_HASH "ad189a940fb60eb71f291321322fe3e8") + set(OPENCV_ICV_NAME "ippicv_2021.8_lnx_ia32_20230330_general.tgz") + set(OPENCV_ICV_HASH "165875443d72faa3fd2146869da90d07") endif() elseif(WIN32 AND NOT ARM) set(OPENCV_ICV_PLATFORM "windows") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_win") if(X86_64) - set(OPENCV_ICV_NAME "ippicv_2020_win_intel64_20191018_general.zip") - set(OPENCV_ICV_HASH "879741a7946b814455eee6c6ffde2984") + set(OPENCV_ICV_NAME "ippicv_2021.8_win_intel64_20230330_general.zip") + set(OPENCV_ICV_HASH "71e4f58de939f0348ec7fb58ffb17dbf") else() - set(OPENCV_ICV_NAME "ippicv_2020_win_ia32_20191018_general.zip") - set(OPENCV_ICV_HASH "cd39bdf0c2e1cac9a61101dad7a2413e") + set(OPENCV_ICV_NAME "ippicv_2021.8_win_ia32_20230330_general.zip") + set(OPENCV_ICV_HASH "57fd4648cfe64eae9e2ad9d50173a553") endif() else() return() diff --git a/doc/js_tutorials/js_assets/js_contours_begin_contours.html b/doc/js_tutorials/js_assets/js_contours_begin_contours.html index 8efd3298a5..09e6ec44e1 100644 --- a/doc/js_tutorials/js_assets/js_contours_begin_contours.html +++ b/doc/js_tutorials/js_assets/js_contours_begin_contours.html @@ -41,7 +41,7 @@