platform/upstream/opencv.git
2 years agoFixed issues found by static analysis
Maksim Shabunin [Wed, 12 Jan 2022 21:13:59 +0000 (00:13 +0300)]
Fixed issues found by static analysis

2 years agoMerge pull request #21424 from dbudniko:dbudniko/media_frame_adapter_enabling
Dmitry Budnikov [Wed, 12 Jan 2022 17:38:14 +0000 (20:38 +0300)]
Merge pull request #21424 from dbudniko:dbudniko/media_frame_adapter_enabling

Adapt remote inference to operate with NV12 blobs

* Media Frame Adapter support

* address comments

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 12 Jan 2022 13:26:10 +0000 (13:26 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21426 from alalek:dnn_simd_unaligned_weights_fix
Alexander Alekhin [Wed, 12 Jan 2022 13:11:45 +0000 (13:11 +0000)]
Merge pull request #21426 from alalek:dnn_simd_unaligned_weights_fix

2 years agoMerge pull request #21422 from alexgiving:atrutnev/wrong_destination_size_deduction_r...
Alexander Alekhin [Wed, 12 Jan 2022 12:43:09 +0000 (12:43 +0000)]
Merge pull request #21422 from alexgiving:atrutnev/wrong_destination_size_deduction_resize

2 years agodnn: don't use aligned load without alignment checks
Alexander Alekhin [Wed, 12 Jan 2022 04:14:48 +0000 (04:14 +0000)]
dnn: don't use aligned load without alignment checks

- weights are unaligned in dasiamprn sample (comes from numpy)

2 years agofix rounding
Aleksei Trutnev [Tue, 11 Jan 2022 22:11:46 +0000 (01:11 +0300)]
fix rounding

2 years agoMerge pull request #21374 from cudawarped:fix_cuda_event_flags
cudawarped [Tue, 11 Jan 2022 20:57:25 +0000 (20:57 +0000)]
Merge pull request #21374 from cudawarped:fix_cuda_event_flags

Allow cv::cuda::Event to accept combinations of flags

2 years agoMerge pull request #21421 from vrabaud:3.4size_t
Alexander Alekhin [Tue, 11 Jan 2022 18:27:17 +0000 (18:27 +0000)]
Merge pull request #21421 from vrabaud:3.4size_t

2 years agoMerge pull request #21400 from Harvey-Huang:master
Harvey [Tue, 11 Jan 2022 16:51:50 +0000 (00:51 +0800)]
Merge pull request #21400 from Harvey-Huang:master

tiff need check TIFFTAG_SAMPLEFORMAT, should not always use unsigned.

2 years agoMerge pull request #21413 from berak:patch-1
Alexander Alekhin [Tue, 11 Jan 2022 15:41:50 +0000 (15:41 +0000)]
Merge pull request #21413 from berak:patch-1

2 years agoFix a potential UBSAN error.
Vincent Rabaud [Tue, 11 Jan 2022 11:01:47 +0000 (12:01 +0100)]
Fix a potential UBSAN error.

We only use that value as uint64_t below anyway.

2 years agoMerge pull request #21409 from sturkmen72:patch-3
Alexander Alekhin [Mon, 10 Jan 2022 17:35:38 +0000 (17:35 +0000)]
Merge pull request #21409 from sturkmen72:patch-3

2 years agoUpdate documentation
Suleyman TURKMEN [Fri, 7 Jan 2022 13:51:21 +0000 (16:51 +0300)]
Update documentation

2 years agoMerge pull request #21416 from alalek:videoio_msmf_sourcereadercb_dtor_message_info
Alexander Alekhin [Mon, 10 Jan 2022 15:22:09 +0000 (15:22 +0000)]
Merge pull request #21416 from alalek:videoio_msmf_sourcereadercb_dtor_message_info

2 years agoMerge pull request #21405 from h6197627:3.4
h6197627 [Mon, 10 Jan 2022 11:51:07 +0000 (13:51 +0200)]
Merge pull request #21405 from h6197627:3.4

* Use c++ namespaces explicitly

* Add root cv c++ namespace

2 years agovideoio(msmf): use info message in SourceReaderCB destructor
Alexander Alekhin [Mon, 10 Jan 2022 09:16:01 +0000 (12:16 +0300)]
videoio(msmf): use info message in SourceReaderCB destructor

2 years agoMerge pull request #21412 from crackwitz:kmeans-N-ge-K-message
Alexander Alekhin [Sun, 9 Jan 2022 21:01:28 +0000 (21:01 +0000)]
Merge pull request #21412 from crackwitz:kmeans-N-ge-K-message

2 years agoUpdate stitching_detailed.py
berak [Sun, 9 Jan 2022 11:26:24 +0000 (12:26 +0100)]
Update stitching_detailed.py

resolves: #21406

use constructors consistently

2 years agokmeans: assertion "There can't be more clusters than elements"
Christoph Rackwitz [Sat, 8 Jan 2022 22:42:21 +0000 (23:42 +0100)]
kmeans: assertion "There can't be more clusters than elements"

2 years agoMerge pull request #21398 from thegrizzlylabs:fix-catalyst-arch
Alexander Alekhin [Thu, 6 Jan 2022 11:34:48 +0000 (11:34 +0000)]
Merge pull request #21398 from thegrizzlylabs:fix-catalyst-arch

2 years agoMerge pull request #21394 from vrabaud:3.4_doc
Alexander Alekhin [Thu, 6 Jan 2022 08:44:04 +0000 (08:44 +0000)]
Merge pull request #21394 from vrabaud:3.4_doc

2 years agoapple/build_xcframework.py: fix incorrect catalyst archs
Guillaume Gigaud [Wed, 5 Jan 2022 14:27:21 +0000 (15:27 +0100)]
apple/build_xcframework.py: fix incorrect catalyst archs

2 years agoRemove unnecessary use of ref-capture in code example.
Vincent Rabaud [Wed, 5 Jan 2022 12:42:55 +0000 (13:42 +0100)]
Remove unnecessary use of ref-capture in code example.

2 years agoMerge pull request #21378 from sturkmen72:fix_legacy_constants
Alexander Alekhin [Tue, 4 Jan 2022 14:33:28 +0000 (14:33 +0000)]
Merge pull request #21378 from sturkmen72:fix_legacy_constants

2 years agoMerge pull request #21382 from stal12:CCL_fix_4conn
Alexander Alekhin [Tue, 4 Jan 2022 13:21:25 +0000 (13:21 +0000)]
Merge pull request #21382 from stal12:CCL_fix_4conn

2 years agoMerge pull request #21375 from JoeHowse:3.4-umatusageflags-docs
Alexander Alekhin [Tue, 4 Jan 2022 13:08:10 +0000 (13:08 +0000)]
Merge pull request #21375 from JoeHowse:3.4-umatusageflags-docs

2 years agocopyright: 2022
Alexander Alekhin [Tue, 4 Jan 2022 12:49:15 +0000 (12:49 +0000)]
copyright: 2022

2 years agocopyright: 2022
Alexander Alekhin [Tue, 4 Jan 2022 12:48:27 +0000 (12:48 +0000)]
copyright: 2022

2 years agoFix #21366
Stefano Allegretti [Mon, 3 Jan 2022 17:15:09 +0000 (18:15 +0100)]
Fix #21366

2 years agofix legacy constants
Suleyman TURKMEN [Sun, 2 Jan 2022 18:41:26 +0000 (21:41 +0300)]
fix legacy constants

2 years agoDoc warnings about experimental UMatUsageFlags
Joe Howse [Fri, 31 Dec 2021 17:49:33 +0000 (13:49 -0400)]
Doc warnings about experimental UMatUsageFlags

2 years agoMerge pull request #21356 from alalek:core_ocl_option_to_abort_on_kernel_build_error
Alexander Alekhin [Thu, 30 Dec 2021 14:04:52 +0000 (14:04 +0000)]
Merge pull request #21356 from alalek:core_ocl_option_to_abort_on_kernel_build_error

2 years agodnn(ocl): fix fp16 kernel compilation
Alexander Alekhin [Tue, 28 Dec 2021 18:02:52 +0000 (18:02 +0000)]
dnn(ocl): fix fp16 kernel compilation

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 29 Dec 2021 15:22:13 +0000 (15:22 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21157 from alexgiving:atrutnev/move_resize
Trutnev Aleksei [Wed, 29 Dec 2021 15:13:43 +0000 (18:13 +0300)]
Merge pull request #21157 from alexgiving:atrutnev/move_resize

GAPI: Move Resize kernel from core to imgproc

* Move Resize kernel from core to imgproc

* Applied style comments

* Adding backward compatibility

* Applied Asya PR

2 years agoMerge pull request #21360 from alalek:core_ocl_option_to_abort_on_kernel_build_error_3.4
Alexander Alekhin [Wed, 29 Dec 2021 15:11:18 +0000 (15:11 +0000)]
Merge pull request #21360 from alalek:core_ocl_option_to_abort_on_kernel_build_error_3.4

2 years agocore(ocl): add option to abort on OpenCL kernel build failure
Alexander Alekhin [Tue, 28 Dec 2021 12:43:42 +0000 (12:43 +0000)]
core(ocl): add option to abort on OpenCL kernel build failure

- exceptions are catched by fallback CPU path
- OPENCV_OPENCL_ABORT_ON_BUILD_ERROR (disabled by default)

2 years agoMerge pull request #21354 from alalek:samples_python_3.10
Alexander Alekhin [Tue, 28 Dec 2021 17:59:48 +0000 (17:59 +0000)]
Merge pull request #21354 from alalek:samples_python_3.10

2 years agoMerge pull request #21318 from alexgiving:atrutnev/move_GKernelPackage
Alexander Alekhin [Tue, 28 Dec 2021 12:20:41 +0000 (12:20 +0000)]
Merge pull request #21318 from alexgiving:atrutnev/move_GKernelPackage

2 years agosamples: query for Python 3.10 setup
Alexander Alekhin [Tue, 28 Dec 2021 11:49:55 +0000 (11:49 +0000)]
samples: query for Python 3.10 setup

2 years agoMerge pull request #21347 from StefanBruens:fix_qt_opengl_link
Alexander Alekhin [Sun, 26 Dec 2021 14:10:08 +0000 (14:10 +0000)]
Merge pull request #21347 from StefanBruens:fix_qt_opengl_link

2 years agohighgui: Fix unresolved OpenGL functions for Qt backend
Stefan Brüns [Sat, 25 Dec 2021 23:08:06 +0000 (00:08 +0100)]
highgui: Fix unresolved OpenGL functions for Qt backend

The Qt backend directly calls some OpenGL functions (glClear, glHint,
glViewport), but since OCV 4.5.5 the GL libraries are no longer part
of the global extra dependencies. When linking with "-Wl,--no-undefined"
this causes linker errors:

`opencv-4.5.5/modules/highgui/src/window_QT.cpp:3307: undefined reference to `glClear'`

Fixes: #21346
Related issues: #21299

2 years agoMerge tag '4.5.5'
Alexander Alekhin [Sat, 25 Dec 2021 11:22:16 +0000 (11:22 +0000)]
Merge tag '4.5.5'

2 years agorelease: OpenCV 4.5.5
Alexander Alekhin [Sat, 25 Dec 2021 03:53:27 +0000 (03:53 +0000)]
release: OpenCV 4.5.5

2 years agoMerge pull request #21343 from alalek:dnn_onnx_handle_domains
Alexander Alekhin [Sat, 25 Dec 2021 02:54:21 +0000 (02:54 +0000)]
Merge pull request #21343 from alalek:dnn_onnx_handle_domains

2 years agodnn(onnx): handle non-default ONNX domains
Alexander Alekhin [Sat, 25 Dec 2021 00:45:41 +0000 (00:45 +0000)]
dnn(onnx): handle non-default ONNX domains

- re-enable quantized models tests

2 years agoMerge pull request #21319 from savuor:backport_levmarqfromscratch
Rostislav Vasilikhin [Fri, 24 Dec 2021 23:00:21 +0000 (02:00 +0300)]
Merge pull request #21319 from savuor:backport_levmarqfromscratch

Warning fixes for quaternion headers

* warning fixes for quaternion headers

* a/T(x) => a * T(1/x)

2 years agoMerge pull request #21197 from SinM9:speech_recognition_python
Alexander Alekhin [Fri, 24 Dec 2021 18:10:47 +0000 (18:10 +0000)]
Merge pull request #21197 from SinM9:speech_recognition_python

2 years agoMerge pull request #21339 from AsyaPronina:asyadev/wa_valgrind_issues
Alexander Alekhin [Fri, 24 Dec 2021 18:10:32 +0000 (18:10 +0000)]
Merge pull request #21339 from AsyaPronina:asyadev/wa_valgrind_issues

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 24 Dec 2021 16:35:47 +0000 (16:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge tag '3.4.17'
Alexander Alekhin [Fri, 24 Dec 2021 16:45:05 +0000 (16:45 +0000)]
Merge tag '3.4.17'

2 years agorelease: OpenCV 3.4.17
Alexander Alekhin [Fri, 24 Dec 2021 16:39:15 +0000 (16:39 +0000)]
release: OpenCV 3.4.17

2 years agoMerge pull request #21341 from alalek:issue_20930_3.4
Alexander Alekhin [Fri, 24 Dec 2021 16:33:19 +0000 (16:33 +0000)]
Merge pull request #21341 from alalek:issue_20930_3.4

2 years agoMove GKernelPackage to cv namespace
Aleksei Trutnev [Fri, 24 Dec 2021 15:04:11 +0000 (18:04 +0300)]
Move GKernelPackage to cv namespace

2 years agopython: use '((x,y), (w,h), angle)' in std::vector<RotatedRect>
Alexander Alekhin [Fri, 24 Dec 2021 14:51:01 +0000 (14:51 +0000)]
python: use '((x,y), (w,h), angle)' in std::vector<RotatedRect>

2 years agoMerge pull request #21329 from alalek:cmake_openexr_find_package
Alexander Alekhin [Fri, 24 Dec 2021 11:56:12 +0000 (11:56 +0000)]
Merge pull request #21329 from alalek:cmake_openexr_find_package

2 years agoMerge pull request #21327 from alalek:imgcodecs_openexr_runtime_disabled
Alexander Alekhin [Fri, 24 Dec 2021 11:55:55 +0000 (11:55 +0000)]
Merge pull request #21327 from alalek:imgcodecs_openexr_runtime_disabled

2 years agoMerge pull request #21320 from catree:solvePnP_doc_page
Alexander Alekhin [Fri, 24 Dec 2021 11:55:34 +0000 (11:55 +0000)]
Merge pull request #21320 from catree:solvePnP_doc_page

2 years agoMerge pull request #21306 from aBITnav:patch-1
Alexander Alekhin [Fri, 24 Dec 2021 10:49:09 +0000 (10:49 +0000)]
Merge pull request #21306 from aBITnav:patch-1

2 years agoDisabling SSE4.1 path in GFluidResize due to Valgrind issues
Anastasiya Pronina [Fri, 24 Dec 2021 10:37:16 +0000 (13:37 +0300)]
Disabling SSE4.1 path in GFluidResize due to Valgrind issues

2 years agoMerge pull request #21336 from alalek:dnn_pooling_check_array_indexes
Alexander Alekhin [Fri, 24 Dec 2021 08:35:11 +0000 (08:35 +0000)]
Merge pull request #21336 from alalek:dnn_pooling_check_array_indexes

2 years agoMerge pull request #21335 from alalek:dnn_onnx_dump_input_output
Alexander Alekhin [Fri, 24 Dec 2021 08:34:47 +0000 (08:34 +0000)]
Merge pull request #21335 from alalek:dnn_onnx_dump_input_output

2 years agoMerge pull request #21325 from APrigarina:fix_asift_sample
Alexander Alekhin [Fri, 24 Dec 2021 08:26:16 +0000 (08:26 +0000)]
Merge pull request #21325 from APrigarina:fix_asift_sample

2 years agoFix: Grammatical mistake
ABHINAV JHA [Tue, 21 Dec 2021 20:43:19 +0000 (02:13 +0530)]
Fix: Grammatical mistake

2 years agocmake: use find_package(OpenEXR) to support OpenEXR 3+
Alexander Alekhin [Thu, 23 Dec 2021 10:39:43 +0000 (10:39 +0000)]
cmake: use find_package(OpenEXR) to support OpenEXR 3+

2 years agodnn: add checks in pooling layer implementation
Alexander Alekhin [Fri, 24 Dec 2021 00:14:17 +0000 (00:14 +0000)]
dnn: add checks in pooling layer implementation

- to avoid out of buffer access

2 years agodnn(onnx): debug dump of inputs/outputs/initializers in importer
Alexander Alekhin [Thu, 23 Dec 2021 16:00:52 +0000 (16:00 +0000)]
dnn(onnx): debug dump of inputs/outputs/initializers in importer

2 years agoMerge pull request #21331 from alalek:issue_21289
Alexander Alekhin [Thu, 23 Dec 2021 20:09:52 +0000 (20:09 +0000)]
Merge pull request #21331 from alalek:issue_21289

2 years agoMerge pull request #21330 from alalek:fix_highgui_gtk_mouse_callbacks
Alexander Alekhin [Thu, 23 Dec 2021 20:09:40 +0000 (20:09 +0000)]
Merge pull request #21330 from alalek:fix_highgui_gtk_mouse_callbacks

2 years agoMerge pull request #21322 from alalek:dnn_catch_errors
Alexander Alekhin [Thu, 23 Dec 2021 20:09:22 +0000 (20:09 +0000)]
Merge pull request #21322 from alalek:dnn_catch_errors

2 years agoSummarize PnP pose computation on a single separate page.
catree [Wed, 22 Dec 2021 20:29:50 +0000 (21:29 +0100)]
Summarize PnP pose computation on a single separate page.

2 years agoMerge pull request #21323 from alalek:dnn_do_not_rebuilt_network_in_setInput
Alexander Alekhin [Thu, 23 Dec 2021 15:45:28 +0000 (15:45 +0000)]
Merge pull request #21323 from alalek:dnn_do_not_rebuilt_network_in_setInput

2 years agodnn(onnx): emit error in Shape for dynamic input
Alexander Alekhin [Thu, 23 Dec 2021 02:01:03 +0000 (02:01 +0000)]
dnn(onnx): emit error in Shape for dynamic input

2 years agodnn(onnx): fix Resize inputs handling
Alexander Alekhin [Thu, 23 Dec 2021 01:59:34 +0000 (01:59 +0000)]
dnn(onnx): fix Resize inputs handling

2 years agodnn: improve debug messages, add ONNX opset version
Alexander Alekhin [Wed, 22 Dec 2021 23:33:57 +0000 (23:33 +0000)]
dnn: improve debug messages, add ONNX opset version

2 years agoMerge pull request #21321 from alalek:dnn_test_decompose_dynamic_axes
Alexander Alekhin [Thu, 23 Dec 2021 15:26:21 +0000 (15:26 +0000)]
Merge pull request #21321 from alalek:dnn_test_decompose_dynamic_axes

2 years agohighgui(gtk): repair scroll events
Alexander Alekhin [Thu, 23 Dec 2021 13:06:44 +0000 (13:06 +0000)]
highgui(gtk): repair scroll events

2 years agohighgui(gtk): fix onmouse event flags
Alexander Alekhin [Thu, 23 Dec 2021 12:15:14 +0000 (12:15 +0000)]
highgui(gtk): fix onmouse event flags

2 years agoimgcodecs: disable OpenEXR in runtime for 3rdparty source code
Alexander Alekhin [Thu, 23 Dec 2021 09:58:56 +0000 (09:58 +0000)]
imgcodecs: disable OpenEXR in runtime for 3rdparty source code

- builtin OpenEXR source code is outdated
- external OpenEXR distributions are allowed

2 years agoprevent index error in find_obj sample
APrigarina [Thu, 23 Dec 2021 07:00:25 +0000 (10:00 +0300)]
prevent index error in find_obj sample

2 years agodnn: do not try to rebuilt network during setInput()
Alexander Alekhin [Thu, 23 Dec 2021 02:37:45 +0000 (02:37 +0000)]
dnn: do not try to rebuilt network during setInput()

- this doesn't make sense in case of multiple inputs

2 years agodnn(test): decompose 'DynamicAxes' test
Alexander Alekhin [Thu, 23 Dec 2021 00:39:09 +0000 (00:39 +0000)]
dnn(test): decompose 'DynamicAxes' test

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 22 Dec 2021 15:54:58 +0000 (15:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21314 from alalek:fix_links_4.x
Alexander Alekhin [Wed, 22 Dec 2021 15:53:43 +0000 (15:53 +0000)]
Merge pull request #21314 from alalek:fix_links_4.x

2 years agoMerge pull request #21313 from alalek:fix_links_3.4
Alexander Alekhin [Wed, 22 Dec 2021 15:53:02 +0000 (15:53 +0000)]
Merge pull request #21313 from alalek:fix_links_3.4

2 years agofix 4.x links
Alexander Alekhin [Wed, 22 Dec 2021 13:01:26 +0000 (13:01 +0000)]
fix 4.x links

2 years agofix 3.4 links
Alexander Alekhin [Wed, 22 Dec 2021 12:38:21 +0000 (12:38 +0000)]
fix 3.4 links

2 years agoMerge pull request #21114 from dwardor:patch-1
dwardor [Wed, 22 Dec 2021 12:00:00 +0000 (13:00 +0100)]
Merge pull request #21114 from dwardor:patch-1

* Fix compile against lapack-3.10.0

Fix compilation against lapack >= 3.9.1 and 3.10.0 while not breaking older versions

OpenCVFindLAPACK.cmake & CMakeLists.txt: determine OPENCV_USE_LAPACK_PREFIX from LAPACK_VERSION

hal_internal.cpp : Only apply LAPACK_FUNC to functions whose number of inputs depends on LAPACK_FORTRAN_STR_LEN in lapack >= 3.9.1

lapack_check.cpp : remove LAPACK_FUNC which is not OK as function are not used with input parameters (so lapack.h preprocessing of "LAPACK_xxxx(...)" is not applicable with lapack >= 3.9.1
If not removed lapack_check fails so LAPACK is deactivated in build (not want we want)

use OCV_ prefix and don't use Global, instead generate OCV_LAPACK_FUNC depending on CMake Conditions

Remove CONFIG from find_package(LAPACK) and use LAPACK_GLOBAL and LAPACK_NAME to figure out if using netlib's reference LAPACK implementation and how to #define OCV_LAPACK_FUNC(f)

* Fix typos and grammar in comments

2 years agoMerge pull request #21303 from alalek:issue_21299_4.x
Alexander Alekhin [Tue, 21 Dec 2021 18:42:58 +0000 (18:42 +0000)]
Merge pull request #21303 from alalek:issue_21299_4.x

2 years agoMerge pull request #21302 from alalek:issue_21299_3.4
Alexander Alekhin [Tue, 21 Dec 2021 18:39:52 +0000 (18:39 +0000)]
Merge pull request #21302 from alalek:issue_21299_3.4

2 years agoMerge pull request #21305 from alalek:cmake_plugins_lowercase_internal_names
Alexander Alekhin [Tue, 21 Dec 2021 18:37:40 +0000 (18:37 +0000)]
Merge pull request #21305 from alalek:cmake_plugins_lowercase_internal_names

2 years agoMerge pull request #21301 from alalek:coverity_fixes_4.x
Alexander Alekhin [Tue, 21 Dec 2021 16:39:04 +0000 (16:39 +0000)]
Merge pull request #21301 from alalek:coverity_fixes_4.x

2 years agocmake: force lowercase plugins internal names
Alexander Alekhin [Tue, 21 Dec 2021 16:34:48 +0000 (16:34 +0000)]
cmake: force lowercase plugins internal names

2 years agohighgui: fix Win32 with OPENGL=ON
Alexander Alekhin [Tue, 21 Dec 2021 15:51:22 +0000 (15:51 +0000)]
highgui: fix Win32 with OPENGL=ON

2 years agoMerge pull request #21297 from rogday:div_fix
Alexander Alekhin [Tue, 21 Dec 2021 15:48:40 +0000 (15:48 +0000)]
Merge pull request #21297 from rogday:div_fix

2 years agohighgui: fix Win32 with OPENGL=ON
Alexander Alekhin [Tue, 21 Dec 2021 15:44:59 +0000 (15:44 +0000)]
highgui: fix Win32 with OPENGL=ON

2 years agovideoio: add non zero check
Alexander Alekhin [Tue, 21 Dec 2021 14:32:19 +0000 (14:32 +0000)]
videoio: add non zero check

2 years agoMerge pull request #21296 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Mon, 20 Dec 2021 18:11:54 +0000 (18:11 +0000)]
Merge pull request #21296 from alalek:update_ffmpeg_4.x

2 years agoMerge pull request #21295 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Mon, 20 Dec 2021 18:11:41 +0000 (18:11 +0000)]
Merge pull request #21295 from alalek:update_ffmpeg_3.4