From db211446f3c2cf650c70dde114f558cb84a516c9 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 11 Jun 2019 14:43:01 +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 82a68675db..457667d007 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 1 -#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 d7744aca0278db9004824c3bf5aadef880405c51 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 24 Jun 2019 14:57:44 +0300 Subject: [PATCH 2/3] dnn: use OpenVINO 2019R2 defines --- cmake/OpenCVDetectInferenceEngine.cmake | 4 ++-- modules/dnn/src/op_inf_engine.hpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index a5c2b5d948..81454184f1 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -80,9 +80,9 @@ endif() if(INF_ENGINE_TARGET) if(NOT INF_ENGINE_RELEASE) - message(WARNING "InferenceEngine version have not been set, 2019R1 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") + message(WARNING "InferenceEngine version have not been set, 2019R2 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") endif() - set(INF_ENGINE_RELEASE "2019010000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)") + set(INF_ENGINE_RELEASE "2019020000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)") set_target_properties(${INF_ENGINE_TARGET} PROPERTIES INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}" ) diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp index 3368e93216..6aa9a3b407 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -21,10 +21,11 @@ #define INF_ENGINE_RELEASE_2018R5 2018050000 #define INF_ENGINE_RELEASE_2019R1 2019010000 +#define INF_ENGINE_RELEASE_2019R2 2019020000 #ifndef INF_ENGINE_RELEASE -#warning("IE version have not been provided via command-line. Using 2019R1 by default") -#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2019R1 +#warning("IE version have not been provided via command-line. Using 2019R2 by default") +#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2019R2 #endif #define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000)) From 693877212d34f2d5e3bbf29287aa1db2d07d4d6d Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 9 Jul 2019 14:08:29 +0300 Subject: [PATCH 3/3] Fixed video writer filename check for plugins --- modules/videoio/src/backend_plugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/videoio/src/backend_plugin.cpp b/modules/videoio/src/backend_plugin.cpp index 17f7a1de4e..71f79c16db 100644 --- a/modules/videoio/src/backend_plugin.cpp +++ b/modules/videoio/src/backend_plugin.cpp @@ -480,7 +480,8 @@ public: if (plugin_api->Writer_open) { CV_Assert(plugin_api->Writer_release); - if (CV_ERROR_OK == plugin_api->Writer_open(filename.empty() ? 0 : filename.c_str(), fourcc, fps, sz.width, sz.height, isColor, &writer)) + CV_Assert(!filename.empty()); + if (CV_ERROR_OK == plugin_api->Writer_open(filename.c_str(), fourcc, fps, sz.width, sz.height, isColor, &writer)) { CV_Assert(writer); return makePtr(plugin_api, writer);