platform/upstream/opencv.git
3 years agoMerge pull request #20191 from alalek:issue_20032
Alexander Alekhin [Wed, 2 Jun 2021 16:29:50 +0000 (16:29 +0000)]
Merge pull request #20191 from alalek:issue_20032

3 years agots: migrate from cgi.escape to html.escape in .py file
Alexander Alekhin [Tue, 1 Jun 2021 19:19:05 +0000 (19:19 +0000)]
ts: migrate from cgi.escape to html.escape in .py file

3 years agoMerge pull request #20150 from rogday:svm_detector_test
Alexander Alekhin [Tue, 1 Jun 2021 13:31:12 +0000 (13:31 +0000)]
Merge pull request #20150 from rogday:svm_detector_test

3 years agoMerge pull request #20011 from Developer-Ecosystem-Engineering:3.4
Developer-Ecosystem-Engineering [Tue, 1 Jun 2021 06:39:55 +0000 (23:39 -0700)]
Merge pull request #20011 from Developer-Ecosystem-Engineering:3.4

Improve performance on Arm64

* Improve performance on Apple silicon

This patch will
- Enable dot product intrinsics for macOS arm64 builds
- Enable for macOS arm64 builds
- Improve HAL primitives
  - reduction (sum, min, max, sad)
  - signmask
  - mul_expand
  - check_any / check_all

Results on a M1 Macbook Pro

* Updates to #20011 based on feedback

  - Removes Apple Silicon specific workarounds
  - Makes #ifdef sections smaller for v_mul_expand cases
  - Moves dot product optimization to compiler optimization check
  - Adds 4x4 matrix transpose optimization

* Remove dotprod and fix v_transpose

Based on the latest, we've removed dotprod entirely and will revisit in a future PR.

Added explicit cats with v_transpose4x4()

This should resolve all opens with this PR

* Remove commented out lines

Remove two extraneous comments

3 years agoMerge pull request #20102 from yo1990:master
yo1990 [Sat, 29 May 2021 14:43:21 +0000 (23:43 +0900)]
Merge pull request #20102 from yo1990:master

Add missing sqrt to magSpectrum().

* https://github.com/opencv/opencv/issues/20100

* slight optimization + fix for double-precision case

Co-authored-by: Yuma Oyama <yuma.oyama@acuity-inc.co.jp>
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@me.com>
3 years agoMerge pull request #19883 from jondea:arm-neon-optimised-color-lab-3.4
Jonathan Deakin [Fri, 28 May 2021 14:20:26 +0000 (15:20 +0100)]
Merge pull request #19883 from jondea:arm-neon-optimised-color-lab-3.4

* Add Neon optimised RGB2Lab conversion

* Fix compile errors, change lambda to macro

* Change NEON optimised RGB2Lab to just use HAL

* Change [] to v_extract_n in RGB2Lab

* RGB2LAB Code quality, change to nlane agnostic

* Change RGB2Lab to use function rather than macro

* Remove whitespace

Co-authored-by: Francesco Petrogalli <25690309+fpetrogalli@users.noreply.github.com>
3 years agoMerge pull request #20174 from alalek:issue_20159
Alexander Alekhin [Fri, 28 May 2021 14:10:17 +0000 (14:10 +0000)]
Merge pull request #20174 from alalek:issue_20159

3 years agoMerge pull request #20172 from alalek:fixup_19334
Alexander Alekhin [Fri, 28 May 2021 14:09:52 +0000 (14:09 +0000)]
Merge pull request #20172 from alalek:fixup_19334

3 years agohighgui: fix trackbar value pointer handling
Alexander Alekhin [Fri, 28 May 2021 01:58:58 +0000 (01:58 +0000)]
highgui: fix trackbar value pointer handling

3 years agocore(ocl): avoid limit of Image kernel args
Alexander Alekhin [Fri, 28 May 2021 00:36:56 +0000 (00:36 +0000)]
core(ocl): avoid limit of Image kernel args

3 years agoMerge pull request #20158 from hyrodium:fix/latex
Alexander Alekhin [Wed, 26 May 2021 06:31:05 +0000 (06:31 +0000)]
Merge pull request #20158 from hyrodium:fix/latex

3 years agofix latex script in the docs
hyrodium [Tue, 25 May 2021 15:21:10 +0000 (00:21 +0900)]
fix latex script in the docs

3 years agoMerge pull request #20135 from mightbxg:bugfix_GaussianBlur
Vadim Pisarevsky [Tue, 25 May 2021 12:54:56 +0000 (12:54 +0000)]
Merge pull request #20135 from mightbxg:bugfix_GaussianBlur

3 years agoadd reproducer and bugfix
Smirnov Egor [Mon, 24 May 2021 14:09:33 +0000 (17:09 +0300)]
add reproducer and bugfix

3 years agofix data overflow problem in GaussianBlur
Xinguang Bian [Fri, 21 May 2021 07:17:20 +0000 (15:17 +0800)]
fix data overflow problem in GaussianBlur

3 years agoMerge pull request #20123 from catree:fix_tsai_park_bib_render
Alexander Alekhin [Wed, 19 May 2021 14:19:53 +0000 (14:19 +0000)]
Merge pull request #20123 from catree:fix_tsai_park_bib_render

3 years agoUse correct BibTeX syntax for month field.
catree [Wed, 19 May 2021 12:24:07 +0000 (14:24 +0200)]
Use correct BibTeX syntax for month field.

3 years agoMerge pull request #20103 from thezane:make-div-spectrums-public
thezane [Wed, 19 May 2021 09:14:11 +0000 (02:14 -0700)]
Merge pull request #20103 from thezane:make-div-spectrums-public

* Make divSpectrums public

* Add unit test

3 years agoMerge pull request #20097 from komakai:fix_qrcode_test
Alexander Alekhin [Mon, 17 May 2021 17:53:34 +0000 (17:53 +0000)]
Merge pull request #20097 from komakai:fix_qrcode_test

3 years agoFix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test
Giles Payne [Sun, 16 May 2021 11:52:36 +0000 (20:52 +0900)]
Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test

3 years agoMerge pull request #20085 from changh95:fix_typo_calib3d_sample_code
Alexander Alekhin [Mon, 17 May 2021 07:26:51 +0000 (07:26 +0000)]
Merge pull request #20085 from changh95:fix_typo_calib3d_sample_code

3 years agoMerge pull request #20088 from alalek:cmake_module_linker_flags
Alexander Alekhin [Mon, 17 May 2021 07:26:25 +0000 (07:26 +0000)]
Merge pull request #20088 from alalek:cmake_module_linker_flags

3 years agofix typo 'undistorsed'->'undistorted'
changh95 [Fri, 14 May 2021 15:22:50 +0000 (00:22 +0900)]
fix typo 'undistorsed'->'undistorted'

3 years agocmake: fix handling of CMAKE_MODULE_LINKER_FLAGS
Alexander Alekhin [Fri, 14 May 2021 17:39:40 +0000 (17:39 +0000)]
cmake: fix handling of CMAKE_MODULE_LINKER_FLAGS

3 years agoMerge pull request #20071 from rogday:depth_fallback_doc
Alexander Alekhin [Fri, 14 May 2021 06:09:08 +0000 (06:09 +0000)]
Merge pull request #20071 from rogday:depth_fallback_doc

3 years agoDocument imwrite depth fallback
Smirnov Egor [Wed, 12 May 2021 10:18:58 +0000 (13:18 +0300)]
Document imwrite depth fallback

3 years agoMerge pull request #20049 from jstaahl:jstaahl-static-inits
Alexander Alekhin [Tue, 11 May 2021 17:06:11 +0000 (17:06 +0000)]
Merge pull request #20049 from jstaahl:jstaahl-static-inits

3 years agoMerge pull request #20053 from berak:core_mat_ptr_vec
Alexander Alekhin [Tue, 11 May 2021 16:34:03 +0000 (16:34 +0000)]
Merge pull request #20053 from berak:core_mat_ptr_vec

3 years agocore: add missing implementation for Mat::ptr(Vec)
berak [Sun, 9 May 2021 12:01:54 +0000 (14:01 +0200)]
core: add missing implementation for Mat::ptr(Vec)

3 years agoRemove static initializers caused by templated static member.
Jake Staahl [Fri, 7 May 2021 19:48:01 +0000 (12:48 -0700)]
Remove static initializers caused by templated static member.

3 years agoMerge pull request #20033 from berak:dnn_openpose_py
Alexander Alekhin [Fri, 7 May 2021 12:42:16 +0000 (12:42 +0000)]
Merge pull request #20033 from berak:dnn_openpose_py

3 years agosamples/dnn: better errormsg in openpose.py
berak [Wed, 5 May 2021 08:34:42 +0000 (10:34 +0200)]
samples/dnn: better errormsg  in openpose.py

3 years agoMerge pull request #20018 from lpea:doc_fixes_calib3d
Alexander Alekhin [Sat, 1 May 2021 09:35:59 +0000 (09:35 +0000)]
Merge pull request #20018 from lpea:doc_fixes_calib3d

3 years agocalib3d: Update documentation of calibrateCamera
Guillaume Jacob [Fri, 30 Apr 2021 14:30:09 +0000 (16:30 +0200)]
calib3d: Update documentation of calibrateCamera

- Added missing documentation for the CALIB_FIX_FOCAL_LENGTH flag
- Removed erroneous information about the number of distortion coefficients
returned
- Added some missing @ref tags

3 years agoMerge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop
Alexander Alekhin [Fri, 30 Apr 2021 17:22:16 +0000 (17:22 +0000)]
Merge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop

3 years agoMerge pull request #19993 from danielenricocahall:fix-compute-ecc-issue
Danny [Fri, 30 Apr 2021 17:20:52 +0000 (13:20 -0400)]
Merge pull request #19993 from danielenricocahall:fix-compute-ecc-issue

Fix unsigned int bug in computeECC

* address issue with unsigned ints in computeEcc

* remove additional logic checking firstOctave

* use swap instead of same src/dst

* simplify the unsigned check logic

3 years agoMerge pull request #20006 from alalek:dnn_ie_gpu_cache_dir
Alexander Alekhin [Fri, 30 Apr 2021 17:18:51 +0000 (17:18 +0000)]
Merge pull request #20006 from alalek:dnn_ie_gpu_cache_dir

3 years agoMerge pull request #20014 from alalek:fix_core_tls_process_termination
Alexander Alekhin [Fri, 30 Apr 2021 16:06:40 +0000 (16:06 +0000)]
Merge pull request #20014 from alalek:fix_core_tls_process_termination

3 years agocore(tls): handle process termination / cleanup issues
Alexander Alekhin [Thu, 29 Apr 2021 21:25:42 +0000 (21:25 +0000)]
core(tls): handle process termination / cleanup issues

3 years agodnn(ie): implicit usage of IE::GPU OpenCL kernels cache
Alexander Alekhin [Thu, 29 Apr 2021 09:37:14 +0000 (12:37 +0300)]
dnn(ie): implicit usage of IE::GPU OpenCL kernels cache

3 years agoMerge pull request #19988 from alexkalmuk:fix-squares-cpp-sample
Alexander Alekhin [Wed, 28 Apr 2021 22:03:14 +0000 (22:03 +0000)]
Merge pull request #19988 from alexkalmuk:fix-squares-cpp-sample

3 years agoMerge pull request #19984 from sturkmen72:patch-4
Alexander Alekhin [Wed, 28 Apr 2021 22:02:02 +0000 (22:02 +0000)]
Merge pull request #19984 from sturkmen72:patch-4

3 years agoFix squares sample failure when a single file passed
Alex Kalmuk [Tue, 27 Apr 2021 08:06:10 +0000 (11:06 +0300)]
Fix squares sample failure when a single file passed

3 years agoMerge pull request #19979 from micha137:patch-3
Alexander Alekhin [Tue, 27 Apr 2021 13:31:05 +0000 (13:31 +0000)]
Merge pull request #19979 from micha137:patch-3

3 years agoFix link
micha137 [Mon, 26 Apr 2021 12:01:50 +0000 (14:01 +0200)]
Fix link

3 years agoMerge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff
Alexander Alekhin [Mon, 26 Apr 2021 22:52:13 +0000 (22:52 +0000)]
Merge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff

3 years agoUpdate CMakeLists.txt
Suleyman TURKMEN [Mon, 26 Apr 2021 15:36:51 +0000 (18:36 +0300)]
Update CMakeLists.txt

3 years agoMerge pull request #19983 from hartmannathan:typo-fix-download
Alexander Alekhin [Mon, 26 Apr 2021 19:25:56 +0000 (19:25 +0000)]
Merge pull request #19983 from hartmannathan:typo-fix-download

3 years agoFix typo: 'DOWNLAOD' to 'DOWNLOAD'
Nathan Hartman [Mon, 26 Apr 2021 15:01:13 +0000 (11:01 -0400)]
Fix typo: 'DOWNLAOD' to 'DOWNLOAD'

3 years agoMerge pull request #19980 from zchrissirhcz:fix-CV_XADD-missing-return-type
Alexander Alekhin [Mon, 26 Apr 2021 14:10:51 +0000 (14:10 +0000)]
Merge pull request #19980 from zchrissirhcz:fix-CV_XADD-missing-return-type

3 years agoMerge pull request #19969 from alalek:issue_19850
Alexander Alekhin [Mon, 26 Apr 2021 13:23:29 +0000 (13:23 +0000)]
Merge pull request #19969 from alalek:issue_19850

3 years agoFix missing return type for unsafe CV_XADD function
Zhuo Zhang [Mon, 26 Apr 2021 12:08:45 +0000 (20:08 +0800)]
Fix missing return type for unsafe CV_XADD function

3 years agoaddress template matching sqdiff bug
danielenricocahall [Mon, 26 Apr 2021 02:17:07 +0000 (22:17 -0400)]
address template matching sqdiff bug

3 years agodoxygen: fix quotes in add_toggle macro
Alexander Alekhin [Fri, 23 Apr 2021 22:30:06 +0000 (22:30 +0000)]
doxygen: fix quotes in add_toggle macro

3 years agoMerge pull request #19951 from stal12:3.4
Stefano Allegretti [Thu, 22 Apr 2021 18:20:12 +0000 (20:20 +0200)]
Merge pull request #19951 from stal12:3.4

* Fix #4363 - wrong hierarchy (CV_RETR_TREE) in findContours

* Add regression test for findContours

* use C++11 => C++98 on 3.4 branch

3 years agoMerge pull request #19961 from alvoron:dnn_ngraph_int64_fix
Aleksandr Voron [Wed, 21 Apr 2021 18:29:19 +0000 (21:29 +0300)]
Merge pull request #19961 from alvoron:dnn_ngraph_int64_fix

Explicit usage of int64_t in CropAndResizeLayer (IE backend)

* Update crop_and_resize_layer.cpp

3 years agofix loop boundary condition
danielenricocahall [Wed, 21 Apr 2021 02:08:01 +0000 (22:08 -0400)]
fix loop boundary condition

3 years agoMerge pull request #19944 from berak:patch-1
Alexander Alekhin [Tue, 20 Apr 2021 17:16:52 +0000 (17:16 +0000)]
Merge pull request #19944 from berak:patch-1

3 years agoUpdate contrast_preserve.hpp
berak [Tue, 20 Apr 2021 10:59:36 +0000 (12:59 +0200)]
Update contrast_preserve.hpp

fix a build warning:

```
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(289): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(361): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
```

(from https://build.opencv.org.cn/job/precommit/job/windows10/1633/console)

3 years agoMerge pull request #19908 from CSBVision:patch-2
Alexander Alekhin [Thu, 15 Apr 2021 20:45:30 +0000 (20:45 +0000)]
Merge pull request #19908 from CSBVision:patch-2

3 years agoMerge pull request #19913 from mshabunin:fix-san-build
Alexander Alekhin [Thu, 15 Apr 2021 11:15:37 +0000 (11:15 +0000)]
Merge pull request #19913 from mshabunin:fix-san-build

3 years agoFix header sorting for modules without headers
Maksim Shabunin [Thu, 15 Apr 2021 09:13:15 +0000 (12:13 +0300)]
Fix header sorting for modules without headers

3 years agoMerge pull request #19886 from alalek:issue_19875
Alexander Alekhin [Wed, 14 Apr 2021 16:14:44 +0000 (16:14 +0000)]
Merge pull request #19886 from alalek:issue_19875

3 years agoUpdate __init__.py to support symbolic links
CSBVision [Wed, 14 Apr 2021 10:05:53 +0000 (12:05 +0200)]
Update __init__.py to support symbolic links

Currently, the LOADER_DIR is set as os.path.dirname(os.path.abspath(__file__)). This does not point to the true library path if the cv2 folder is symlinked into the Python package directory such that importing cv2 under Python fails. The proposed change only resolves symbolic links correctly by calling os.path.realpath(__file__) first and does not change anything if __file__ contains no symbolic link.

3 years agoMerge pull request #19900 from berak:doc_fix_python_retval
Alexander Alekhin [Tue, 13 Apr 2021 17:38:06 +0000 (17:38 +0000)]
Merge pull request #19900 from berak:doc_fix_python_retval

3 years agoMerge pull request #19901 from alalek:ml_update_checks
Alexander Alekhin [Tue, 13 Apr 2021 15:47:01 +0000 (15:47 +0000)]
Merge pull request #19901 from alalek:ml_update_checks

3 years agodocs:fix python retvals
berak [Tue, 13 Apr 2021 10:51:34 +0000 (12:51 +0200)]
docs:fix python retvals

3 years agoml: update checks
Alexander Alekhin [Tue, 13 Apr 2021 11:09:14 +0000 (11:09 +0000)]
ml: update checks

3 years agoMerge pull request #19894 from alalek:fix_ml_tree_legacy_import
Alexander Alekhin [Mon, 12 Apr 2021 20:33:34 +0000 (20:33 +0000)]
Merge pull request #19894 from alalek:fix_ml_tree_legacy_import

3 years agoml: fix legacy import in DTreesImpl
Alexander Alekhin [Mon, 12 Apr 2021 19:05:52 +0000 (19:05 +0000)]
ml: fix legacy import in DTreesImpl

3 years agoMerge pull request #19851 from sturkmen72:update_documentation
Alexander Alekhin [Sun, 11 Apr 2021 21:44:02 +0000 (21:44 +0000)]
Merge pull request #19851 from sturkmen72:update_documentation

3 years agoMerge pull request #19884 from danielenricocahall:fix-prediction-features-bug
Danny [Fri, 9 Apr 2021 16:56:14 +0000 (12:56 -0400)]
Merge pull request #19884 from danielenricocahall:fix-prediction-features-bug

Fix bug with predictions in RTrees/Boost

* address bug where predict functions with invalid feature count in rtrees/boost models

* compact matrix rep in tests

* check 1..n-1 and n+1 in feature size validation test

3 years agocore: avoid process cleanup deadlock if TlsStorage is not used
Alexander Alekhin [Fri, 9 Apr 2021 15:46:11 +0000 (15:46 +0000)]
core: avoid process cleanup deadlock if TlsStorage is not used

3 years agoUpdate Documentation
Suleyman TURKMEN [Sat, 3 Apr 2021 12:11:38 +0000 (15:11 +0300)]
Update Documentation

3 years agoMerge pull request #19859 from danielenricocahall:fix-blob-detector-single-thresh
Danny [Thu, 8 Apr 2021 10:39:26 +0000 (06:39 -0400)]
Merge pull request #19859 from danielenricocahall:fix-blob-detector-single-thresh

Fix Single ThresholdBug in Simple Blob Detector

* address bug with using min dist between blobs in blob detector

cast type in comparison and remove docs

address bug with using min dist between blobs in blob detector

use scalar instead of int

address bug with using min dist between blobs in blob detector

* fix namespace and formatting

3 years agoMerge pull request #19836 from 103yiran:warpaffine
Alexander Alekhin [Thu, 8 Apr 2021 10:32:26 +0000 (10:32 +0000)]
Merge pull request #19836 from 103yiran:warpaffine

3 years agoMerge pull request #19847 from gasparitiago:expose-max-iters
Alexander Alekhin [Thu, 8 Apr 2021 10:31:36 +0000 (10:31 +0000)]
Merge pull request #19847 from gasparitiago:expose-max-iters

3 years agoMerge pull request #19838 from mshabunin:fix-intel-ipp-link
Alexander Alekhin [Wed, 7 Apr 2021 09:42:32 +0000 (09:42 +0000)]
Merge pull request #19838 from mshabunin:fix-intel-ipp-link

3 years agoExpose maxIters in findEssentialMat
Tiago De Gaspari [Wed, 7 Apr 2021 01:11:03 +0000 (22:11 -0300)]
Expose maxIters in findEssentialMat

Lets the user choose the maximum number of iterations the robust
estimator runs for, similary to findFundamentalMat
and findHomography functions.

3 years agoMerge pull request #19810 from aarongreig:aaron/core/relaxClArithmTest
Alexander Alekhin [Tue, 6 Apr 2021 19:56:45 +0000 (19:56 +0000)]
Merge pull request #19810 from aarongreig:aaron/core/relaxClArithmTest

3 years agoRelax accuracy requirements in the OpenCL sqrt perf arithmetic test.
Aaron Greig [Wed, 31 Mar 2021 09:16:19 +0000 (10:16 +0100)]
Relax accuracy requirements in the OpenCL sqrt perf arithmetic test.

Also bring perf_imgproc CornerMinEigenVal accuracy requirements in line with
the test_imgproc accuracy requirements on that test and fix indentation on
the latter.

Partially addresses issue #9821

3 years agoMerge pull request #19854 from gasparitiago:fundamentalMat-fix
Alexander Alekhin [Tue, 6 Apr 2021 10:19:57 +0000 (10:19 +0000)]
Merge pull request #19854 from gasparitiago:fundamentalMat-fix

3 years agoAdd maxIters parameter to LMeDS method in findFundamentalMat
Tiago De Gaspari [Sun, 4 Apr 2021 00:56:05 +0000 (21:56 -0300)]
Add maxIters parameter to LMeDS method in findFundamentalMat

This commit passes the parameter maxIters that represent
the maximum number of iterations, that can be passed to findFundamentalMat
to the method LMeDS.

This parameter were added to the function findFundamentalMat and
were passed just for the RANSAC method, but should be passed to
both methods to be consistent.

3 years agoMerge tag '3.4.14'
Alexander Alekhin [Fri, 2 Apr 2021 09:31:32 +0000 (09:31 +0000)]
Merge tag '3.4.14'

3 years agoIPP: use linker workaround for Intel compiler on Linux
Maksim Shabunin [Fri, 2 Apr 2021 07:44:32 +0000 (10:44 +0300)]
IPP: use linker workaround for Intel compiler on Linux

3 years agodelete unused variable
103yiran [Fri, 2 Apr 2021 02:30:27 +0000 (10:30 +0800)]
delete unused variable

3 years agorelease: OpenCV 3.4.14
Alexander Alekhin [Thu, 1 Apr 2021 21:37:19 +0000 (21:37 +0000)]
release: OpenCV 3.4.14

3 years agoMerge pull request #19823 from alalek:issue_contrib_2895
Alexander Alekhin [Thu, 1 Apr 2021 20:38:46 +0000 (20:38 +0000)]
Merge pull request #19823 from alalek:issue_contrib_2895

3 years agoMerge pull request #19830 from alalek:issue_19368
Alexander Alekhin [Thu, 1 Apr 2021 15:30:18 +0000 (15:30 +0000)]
Merge pull request #19830 from alalek:issue_19368

3 years agoMerge pull request #19831 from alalek:backport_19771
Alexander Alekhin [Thu, 1 Apr 2021 14:05:09 +0000 (14:05 +0000)]
Merge pull request #19831 from alalek:backport_19771

3 years agoMerge pull request #19827 from alalek:build_videoio_macosx_override_3.4
Alexander Alekhin [Thu, 1 Apr 2021 12:34:23 +0000 (12:34 +0000)]
Merge pull request #19827 from alalek:build_videoio_macosx_override_3.4

3 years agoMerge pull request #19825 from alalek:cmake_fix_headers_order_python_3.4
Alexander Alekhin [Thu, 1 Apr 2021 12:34:10 +0000 (12:34 +0000)]
Merge pull request #19825 from alalek:cmake_fix_headers_order_python_3.4

3 years agoMerge pull request #19822 from alalek:core_wui_backward_compatibility
Alexander Alekhin [Thu, 1 Apr 2021 12:32:33 +0000 (12:32 +0000)]
Merge pull request #19822 from alalek:core_wui_backward_compatibility

3 years agovideoio(dshow): add NULL ptr check
Alexander Alekhin [Thu, 1 Apr 2021 11:28:41 +0000 (11:28 +0000)]
videoio(dshow): add NULL ptr check

3 years agovideoio(build): eliminate inconsistent 'override' warnings
Alexander Alekhin [Thu, 1 Apr 2021 09:22:12 +0000 (09:22 +0000)]
videoio(build): eliminate inconsistent 'override' warnings

3 years agocmake: fix files order in Python bindings
Alexander Alekhin [Thu, 1 Apr 2021 09:48:50 +0000 (09:48 +0000)]
cmake: fix files order in Python bindings

- with changes backport from 4.x

3 years agocuda: fix inplace condition in cv::cuda::flip
Alexander Alekhin [Thu, 1 Apr 2021 02:26:59 +0000 (02:26 +0000)]
cuda: fix inplace condition in cv::cuda::flip

3 years agocore: backward compatibility for vx_store/vx_store_aligned calls
Alexander Alekhin [Thu, 1 Apr 2021 02:17:08 +0000 (02:17 +0000)]
core: backward compatibility for vx_store/vx_store_aligned calls

3 years agoMerge pull request #19819 from alalek:cmake_fix_headers_order
Alexander Alekhin [Thu, 1 Apr 2021 01:34:21 +0000 (01:34 +0000)]
Merge pull request #19819 from alalek:cmake_fix_headers_order

3 years agocmake: fix order of headers
Alexander Alekhin [Wed, 31 Mar 2021 23:14:45 +0000 (23:14 +0000)]
cmake: fix order of headers

- cmake uses filesystem's order which may vary
- unpredictable headers order may cause build failures (primary bindings)