From 9c748beef5d8472d40ff6aaf4d03a89f967cf775 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 26 Feb 2019 14:19:10 +0300 Subject: [PATCH 1/3] OpenCV version '-openvino' --- 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 1200b3b9bb..30d5bed4e6 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 4 #define CV_VERSION_MINOR 1 #define CV_VERSION_REVISION 0 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "-openvino" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From 00171ca935d945ec9831d67ff0ef020f078cd19a Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Mon, 18 Mar 2019 12:24:18 +0300 Subject: [PATCH 2/3] Patched libpng to address CVE-2019-7317 --- 3rdparty/libpng/png.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/3rdparty/libpng/png.c b/3rdparty/libpng/png.c index 3dce191d17..ea44e2b688 100644 --- a/3rdparty/libpng/png.c +++ b/3rdparty/libpng/png.c @@ -4588,8 +4588,7 @@ png_image_free(png_imagep image) if (image != NULL && image->opaque != NULL && image->opaque->error_buf == NULL) { - /* Ignore errors here: */ - (void)png_safe_execute(image, png_image_free_function, image); + png_image_free_function(image); image->opaque = NULL; } } From 371bba8f54560b374fbcd47e7e02f015ac4969ad Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sun, 7 Apr 2019 17:09:10 +0000 Subject: [PATCH 3/3] release: OpenCV 4.1.0 OpenCV 4.1.0 --- 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 1200b3b9bb..1dbe223893 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 4 #define CV_VERSION_MINOR 1 #define CV_VERSION_REVISION 0 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)