From 64c018507b013ca6117e5f664c630b81531807fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20St=C3=BCdemann?= Date: Thu, 3 Jun 2021 22:12:46 +0200 Subject: [PATCH 1/4] videoio(dshow) fix memory leak --- modules/videoio/src/cap_dshow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp index cf653f61a7..94837e7ab2 100644 --- a/modules/videoio/src/cap_dshow.cpp +++ b/modules/videoio/src/cap_dshow.cpp @@ -2496,7 +2496,10 @@ static void findClosestSizeAndSubtype(videoDevice * VD, int widthIn, int heightI int tempH = 999999; //Don't want to get stuck in a loop - if(stepX < 1 || stepY < 1) continue; + if(stepX < 1 || stepY < 1){ + MyDeleteMediaType(pmtConfig); + continue; + } //DebugPrintOut("min is %i %i max is %i %i - res is %i %i\n", scc.MinOutputSize.cx, scc.MinOutputSize.cy, scc.MaxOutputSize.cx, scc.MaxOutputSize.cy, stepX, stepY); //DebugPrintOut("min frame duration is %i max duration is %i\n", scc.MinFrameInterval, scc.MaxFrameInterval); From 636db09d73a655a6c2e5317e6cfa2a39d9c5bdf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20St=C3=BCdemann?= Date: Thu, 3 Jun 2021 22:11:24 +0200 Subject: [PATCH 2/4] videoio(dshow) fix incompatible media type left set on video device --- modules/videoio/src/cap_dshow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp index cf653f61a7..d80e13a7b5 100644 --- a/modules/videoio/src/cap_dshow.cpp +++ b/modules/videoio/src/cap_dshow.cpp @@ -2609,7 +2609,8 @@ static bool setSizeAndSubtype(videoDevice * VD, int attemptWidth, int attemptHei return true; }else{ VD->streamConf->SetFormat(tmpType); - if( tmpType != NULL )MyDeleteMediaType(tmpType); + if( VD->pAmMediaType != NULL)MyDeleteMediaType(VD->pAmMediaType); + VD->pAmMediaType = tmpType; } return false; From f4a79b055445b2656ac9b4ba4880c708273e8509 Mon Sep 17 00:00:00 2001 From: jogo- Date: Mon, 7 Jun 2021 19:32:14 +0200 Subject: [PATCH 3/4] Merge pull request #20223 from jogo-:3.4_wp8_samples_typos * Fix typo in App.xaml.cs * Fix typo in App.xaml.cs * Fix typo in App.xaml.cs --- .../PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs | 4 ++-- .../PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs | 4 ++-- samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs index fd2a7c8466..73190e28f3 100644 --- a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs +++ b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs @@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1 catch { // If an exception is caught here it is most likely due to either - // ResourceLangauge not being correctly set to a supported language + // ResourceLanguage not being correctly set to a supported language // code or ResourceFlowDirection is set to a value other than LeftToRight // or RightToLeft. @@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1 } } } -} \ No newline at end of file +} diff --git a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs index fd2a7c8466..73190e28f3 100644 --- a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs +++ b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1/App.xaml.cs @@ -207,7 +207,7 @@ namespace PhoneXamlDirect3DApp1 catch { // If an exception is caught here it is most likely due to either - // ResourceLangauge not being correctly set to a supported language + // ResourceLanguage not being correctly set to a supported language // code or ResourceFlowDirection is set to a value other than LeftToRight // or RightToLeft. @@ -220,4 +220,4 @@ namespace PhoneXamlDirect3DApp1 } } } -} \ No newline at end of file +} diff --git a/samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs b/samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs index 6fe3a54410..17f8fed93e 100644 --- a/samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs +++ b/samples/wp8/OpenCVXaml/OpenCVXaml/App.xaml.cs @@ -207,7 +207,7 @@ namespace OpenCVXaml catch { // If an exception is caught here it is most likely due to either - // ResourceLangauge not being correctly set to a supported language + // ResourceLanguage not being correctly set to a supported language // code or ResourceFlowDirection is set to a value other than LeftToRight // or RightToLeft. @@ -220,4 +220,4 @@ namespace OpenCVXaml } } } -} \ No newline at end of file +} From 43940f7ffc0c60ef83ce243572b744696f6d8247 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 7 Jun 2021 20:10:34 +0000 Subject: [PATCH 4/4] pre: OpenCV 3.4.15 (version++) --- .../cross_referencing/tutorial_cross_referencing.markdown | 4 ++-- modules/core/include/opencv2/core/version.hpp | 4 ++-- modules/dnn/include/opencv2/dnn/dnn.hpp | 4 ++-- modules/python/package/setup.py | 2 +- platforms/android/build_sdk.py | 2 +- platforms/android/service/readme.txt | 2 +- platforms/maven/opencv-it/pom.xml | 2 +- platforms/maven/opencv/pom.xml | 2 +- platforms/maven/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown index 65159659f1..ac347cbca9 100644 --- a/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown +++ b/doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown @@ -39,14 +39,14 @@ Open your Doxyfile using your favorite text editor and search for the key `TAGFILES`. Change it as follows: @code -TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.14 +TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.15 @endcode If you had other definitions already, you can append the line using a `\`: @code TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \ - ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.14 + ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.15 @endcode Doxygen can now use the information from the tag file to link to the OpenCV diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index e10108b4d8..a71c13ebd1 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -7,8 +7,8 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 -#define CV_VERSION_REVISION 14 -#define CV_VERSION_STATUS "-dev" +#define CV_VERSION_REVISION 15 +#define CV_VERSION_STATUS "-pre" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp index e31e89bde5..524dc587e6 100644 --- a/modules/dnn/include/opencv2/dnn/dnn.hpp +++ b/modules/dnn/include/opencv2/dnn/dnn.hpp @@ -47,9 +47,9 @@ #include "opencv2/core/async.hpp" #if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS -#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v21 { +#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v22 { #define CV__DNN_EXPERIMENTAL_NS_END } -namespace cv { namespace dnn { namespace experimental_dnn_34_v21 { } using namespace experimental_dnn_34_v21; }} +namespace cv { namespace dnn { namespace experimental_dnn_34_v22 { } using namespace experimental_dnn_34_v22; }} #else #define CV__DNN_EXPERIMENTAL_NS_BEGIN #define CV__DNN_EXPERIMENTAL_NS_END diff --git a/modules/python/package/setup.py b/modules/python/package/setup.py index d0262cbb50..7c015770e6 100644 --- a/modules/python/package/setup.py +++ b/modules/python/package/setup.py @@ -9,7 +9,7 @@ def main(): os.chdir(SCRIPT_DIR) package_name = 'opencv' - package_version = os.environ.get('OPENCV_VERSION', '3.4.14') # TODO + package_version = os.environ.get('OPENCV_VERSION', '3.4.15') # TODO long_description = 'Open Source Computer Vision Library Python bindings' # TODO diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 763aac9ebe..cbde665611 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -269,7 +269,7 @@ class Builder: # Add extra data apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True) apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True) - for ver, d in self.extra_packs + [("3.4.14", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.4.15", os.path.join(self.libdest, "lib"))]: r = ET.Element("library", attrib={"version": ver}) log.info("Adding libraries from %s", d) diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index c0b4f6df12..a10138c1a6 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -12,7 +12,7 @@ manually using adb tool: adb install /apk/OpenCV__Manager__.apk -Example: OpenCV_3.4.14-dev_Manager_3.49_armeabi-v7a.apk +Example: OpenCV_3.4.15-dev_Manager_3.49_armeabi-v7a.apk Use the list of platforms below to determine proper OpenCV Manager package for your device: diff --git a/platforms/maven/opencv-it/pom.xml b/platforms/maven/opencv-it/pom.xml index dca1af9e46..bef5fe28aa 100644 --- a/platforms/maven/opencv-it/pom.xml +++ b/platforms/maven/opencv-it/pom.xml @@ -4,7 +4,7 @@ org.opencv opencv-parent - 3.4.14 + 3.4.15 org.opencv opencv-it diff --git a/platforms/maven/opencv/pom.xml b/platforms/maven/opencv/pom.xml index 368a9a3518..6b11c7a0fa 100644 --- a/platforms/maven/opencv/pom.xml +++ b/platforms/maven/opencv/pom.xml @@ -4,7 +4,7 @@ org.opencv opencv-parent - 3.4.14 + 3.4.15 org.opencv opencv diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml index 31ceab6fb1..69e5772489 100644 --- a/platforms/maven/pom.xml +++ b/platforms/maven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opencv opencv-parent - 3.4.14 + 3.4.15 pom OpenCV Parent POM