From 1eb1d4c3708f2bd95562cedd58d28461505c2d37 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 27 Jun 2023 14:29:13 +0300 Subject: [PATCH 1/4] Release OpenCV 3.4.20 --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index e4418b785733..44004272a071 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 20 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From 7f6c95f2d7a41881af7dcaf3b5701837f0c6bc57 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 28 Jun 2023 18:40:55 +0300 Subject: [PATCH 2/4] Switch to version 3.4.20-dev --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 44004272a071..4e8b576a2062 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 20 -#define CV_VERSION_STATUS "" +#define CV_VERSION_STATUS "-dev" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From 4761c2814327f1cc6c8da6e099eb3321be9be4e7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:34:50 +0200 Subject: [PATCH 3/4] Merge pull request #24168 from autoantwort:missing-include-3 * add missing include * Apply CR --- modules/dnn/src/op_halide.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/dnn/src/op_halide.cpp b/modules/dnn/src/op_halide.cpp index c96971bc6aac..d107e01887d0 100644 --- a/modules/dnn/src/op_halide.cpp +++ b/modules/dnn/src/op_halide.cpp @@ -11,6 +11,7 @@ #ifdef HAVE_HALIDE #include +#include #endif // HAVE_HALIDE namespace cv From cac1695099308a0739ee95adb2dd1773e8744788 Mon Sep 17 00:00:00 2001 From: eplankin Date: Wed, 25 Oct 2023 10:01:19 -0700 Subject: [PATCH 4/4] Update IPPICV binaries (20230919) --- 3rdparty/ippicv/ippicv.cmake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake index 08cf091db381..380f65f8c678 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 "1224f78da6684df04397ac0f40c961ed37f79ccb") + set(IPPICV_COMMIT "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a") # Define actual ICV versions if(APPLE) set(OPENCV_ICV_PLATFORM "macosx") set(OPENCV_ICV_PACKAGE_SUBDIR "ippicv_mac") - set(OPENCV_ICV_NAME "ippicv_2021.8_mac_intel64_20230330_general.tgz") - set(OPENCV_ICV_HASH "d2b234a86af1b616958619a4560356d9") + set(OPENCV_ICV_NAME "ippicv_2021.9.1_mac_intel64_20230919_general.tgz") + set(OPENCV_ICV_HASH "14f01c5a4780bfae9dde9b0aaf5e56fc") 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_2021.8_lnx_intel64_20230330_general.tgz") - set(OPENCV_ICV_HASH "43219bdc7e3805adcbe3a1e2f1f3ef3b") + set(OPENCV_ICV_NAME "ippicv_2021.10.0_lnx_intel64_20230919_general.tgz") + set(OPENCV_ICV_HASH "606a19b207ebedfe42d59fd916cc4850") else() - set(OPENCV_ICV_NAME "ippicv_2021.8_lnx_ia32_20230330_general.tgz") - set(OPENCV_ICV_HASH "165875443d72faa3fd2146869da90d07") + set(OPENCV_ICV_NAME "ippicv_2021.10.0_lnx_ia32_20230919_general.tgz") + set(OPENCV_ICV_HASH "ea08487b810baad2f68aca87b74a2db9") 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_2021.8_win_intel64_20230330_general.zip") - set(OPENCV_ICV_HASH "71e4f58de939f0348ec7fb58ffb17dbf") + set(OPENCV_ICV_NAME "ippicv_2021.10.0_win_intel64_20230919_general.zip") + set(OPENCV_ICV_HASH "538a819ec84193a9c9f3c0f8df0be8b7") else() - set(OPENCV_ICV_NAME "ippicv_2021.8_win_ia32_20230330_general.zip") - set(OPENCV_ICV_HASH "57fd4648cfe64eae9e2ad9d50173a553") + set(OPENCV_ICV_NAME "ippicv_2021.10.0_win_ia32_20230919_general.zip") + set(OPENCV_ICV_HASH "8ff93c69415ab0835cc1e94dc5660f5d") endif() else() return()