Alexander Alekhin [Wed, 30 Jun 2021 14:59:22 +0000 (14:59 +0000)]
Merge pull request #20330 from Wovchena:fix-arg-for-calcHist-in-demos
Vladimir [Wed, 30 Jun 2021 07:15:58 +0000 (10:15 +0300)]
Fix an arg for calcHist() in demos
`float* histRange = { range };` doesn't make much sense. `histRange` is
an array of array(s), so it should have a type of ptr to ptr. Strangely
some domos are correct as well as the example for the function
https://docs.opencv.org/master/d6/dc7/group__imgproc__hist.html#ga4b2b5fd75503ff9e6844cc4dcdaed35d
Alexander Alekhin [Mon, 21 Jun 2021 21:52:17 +0000 (21:52 +0000)]
Merge pull request #20128 from kikaxa:master
Alexander Alekhin [Mon, 21 Jun 2021 11:27:12 +0000 (11:27 +0000)]
Merge pull request #20283 from SamFC10:fix-batchnorm
kikaxa [Thu, 20 May 2021 13:01:36 +0000 (16:01 +0300)]
Reenable filesystem for ios builds
SamFC10 [Sun, 20 Jun 2021 07:49:29 +0000 (13:19 +0530)]
Fix BatchNorm reinitialization
Alexander Alekhin [Fri, 18 Jun 2021 19:47:52 +0000 (19:47 +0000)]
Merge pull request #20232 from gasparitiago:drawMatches3.4
Alexander Alekhin [Fri, 18 Jun 2021 15:46:43 +0000 (15:46 +0000)]
Merge pull request #20253 from rogday:gtk_modifiers
Alexander Alekhin [Tue, 15 Jun 2021 18:20:21 +0000 (18:20 +0000)]
Merge pull request #20263 from vrabaud:3.4
Vincent Rabaud [Fri, 11 Jun 2021 20:03:33 +0000 (22:03 +0200)]
Fix potential NaN in cv::norm.
There can be an int overflow.
cv::norm( InputArray _src, int normType, InputArray _mask ) is fine,
not cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask ).
Tiago De Gaspari [Sat, 12 Jun 2021 20:28:54 +0000 (17:28 -0300)]
Merge pull request #19842 from gasparitiago:3.4
Update rotatedRectangleIntersection function to calculate near to origin
* Change type used in points function from RotatedRect
In the function that sets the points of a RotatedRect, the types
should be double in order to keep the precision when dealing with
RotatedRects that are defined far from the origin.
This commit solves the problem in some assertions from
rotatedRectangleIntersection when dealing with rectangles far from
origin.
* added proper type casts
* Update rotatedRectangleIntersection function to calculate near to origin
This commit changes the rotatedRectangleIntersection function in order
to calculate the intersection of two rectangles considering that they
are shifted near the coordinates origin (0, 0).
This commit solves the problem in some assertions from
rotatedRectangleIntersection when dealing with rectangles far from
origin.
* Revert type changes in types.cpp and adequate code to c++98
* Revert unnecessary casts on types.cpp
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Alexander Alekhin [Fri, 11 Jun 2021 20:06:09 +0000 (20:06 +0000)]
Merge pull request #20190 from rogday:tf_importer_ref
rogday [Tue, 1 Jun 2021 14:05:27 +0000 (17:05 +0300)]
split if into map of functions
Smirnov Egor [Wed, 9 Jun 2021 15:43:42 +0000 (18:43 +0300)]
applied modifier mask to the state
Alexander Alekhin [Wed, 9 Jun 2021 10:58:18 +0000 (10:58 +0000)]
Merge pull request #20251 from alalek:python_sys_path_0_workaround
Alexander Alekhin [Wed, 9 Jun 2021 10:52:16 +0000 (10:52 +0000)]
Merge pull request #20248 from alalek:issue_20246
Alexander Alekhin [Wed, 9 Jun 2021 09:51:07 +0000 (09:51 +0000)]
python(loader): add workaround to detect and patch sys.path[0]
Alexander Alekhin [Wed, 9 Jun 2021 07:31:38 +0000 (07:31 +0000)]
core: fix nSize initialization in cvIplImage()
Alexander Alekhin [Tue, 8 Jun 2021 13:44:58 +0000 (13:44 +0000)]
Merge pull request #20241 from alalek:fixup_20149
Alexander Alekhin [Tue, 8 Jun 2021 08:39:06 +0000 (08:39 +0000)]
highgui(gtk): fix NULL ptr checks
Alexander Alekhin [Mon, 7 Jun 2021 22:05:29 +0000 (22:05 +0000)]
Merge pull request #20236 from alalek:update_version_3.4.15-pre
Alexander Alekhin [Mon, 7 Jun 2021 20:10:34 +0000 (20:10 +0000)]
pre: OpenCV 3.4.15 (version++)
jogo- [Mon, 7 Jun 2021 17:32:14 +0000 (19:32 +0200)]
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
Tiago De Gaspari [Mon, 7 Jun 2021 13:55:23 +0000 (10:55 -0300)]
Add Thickness parameter in drawMatches function
This commit adds the feature of selecting the thickness
of the matches drawn by the drawMatches function.
In larger images, the default thickness of 1 pixel creates images
that are hard to visualize.
Alexander Alekhin [Sat, 5 Jun 2021 16:02:12 +0000 (16:02 +0000)]
Merge pull request #20211 from kstuedem:fix_dshow_memory_leak
Alexander Alekhin [Sat, 5 Jun 2021 16:01:51 +0000 (16:01 +0000)]
Merge pull request #20210 from kstuedem:fix_invalid_media_type
Kai Stüdemann [Thu, 3 Jun 2021 20:11:24 +0000 (22:11 +0200)]
videoio(dshow) fix incompatible media type left set on video device
Kai Stüdemann [Thu, 3 Jun 2021 20:12:46 +0000 (22:12 +0200)]
videoio(dshow) fix memory leak
Alexander Alekhin [Thu, 3 Jun 2021 16:20:24 +0000 (16:20 +0000)]
Merge pull request #20201 from PolarNick239:3.4
Paul Jurczak [Wed, 2 Jun 2021 19:15:52 +0000 (13:15 -0600)]
Merge pull request #20080 from pauljurczak:patch-3
* Update dnn.hpp
getPerfProfile is not supported by the CUDA backend, see https://github.com/opencv/opencv/issues/20077
* dnn.hpp: fix doxygen formatting
Alexander Alekhin [Wed, 2 Jun 2021 17:50:29 +0000 (17:50 +0000)]
Merge pull request #20146 from asmorkalov:as/java_test_filter
Alexander Alekhin [Wed, 2 Jun 2021 17:48:43 +0000 (17:48 +0000)]
Merge pull request #20149 from rogday:on_mouse_floor
Alexander Alekhin [Wed, 2 Jun 2021 16:30:24 +0000 (16:30 +0000)]
Merge pull request #20192 from alalek:update_libjpeg-turbo
Alexander Alekhin [Wed, 2 Jun 2021 16:29:50 +0000 (16:29 +0000)]
Merge pull request #20191 from alalek:issue_20032
Nikolay Polyarniy [Wed, 2 Jun 2021 12:53:32 +0000 (15:53 +0300)]
EXR reading: support Z channel if no Y channel
Alexander Alekhin [Tue, 1 Jun 2021 19:48:49 +0000 (19:48 +0000)]
3rdparty: libjpeg-turbo 2.0.6 => 2.1.0
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.0
Alexander Alekhin [Tue, 1 Jun 2021 19:19:05 +0000 (19:19 +0000)]
ts: migrate from cgi.escape to html.escape in .py file
Alexander Alekhin [Tue, 1 Jun 2021 13:31:12 +0000 (13:31 +0000)]
Merge pull request #20150 from rogday:svm_detector_test
Alexander Smorkalov [Mon, 24 May 2021 12:10:38 +0000 (15:10 +0300)]
Analog of gtest_filter for java tests.
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
Smirnov Egor [Mon, 24 May 2021 13:39:02 +0000 (16:39 +0300)]
bring back bounds check and switch to floor
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>
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>
Alexander Alekhin [Fri, 28 May 2021 14:10:17 +0000 (14:10 +0000)]
Merge pull request #20174 from alalek:issue_20159
Alexander Alekhin [Fri, 28 May 2021 14:09:52 +0000 (14:09 +0000)]
Merge pull request #20172 from alalek:fixup_19334
Alexander Alekhin [Fri, 28 May 2021 01:58:58 +0000 (01:58 +0000)]
highgui: fix trackbar value pointer handling
Alexander Alekhin [Fri, 28 May 2021 00:36:56 +0000 (00:36 +0000)]
core(ocl): avoid limit of Image kernel args
Alexander Alekhin [Wed, 26 May 2021 06:31:05 +0000 (06:31 +0000)]
Merge pull request #20158 from hyrodium:fix/latex
hyrodium [Tue, 25 May 2021 15:21:10 +0000 (00:21 +0900)]
fix latex script in the docs
Vadim Pisarevsky [Tue, 25 May 2021 12:54:56 +0000 (12:54 +0000)]
Merge pull request #20135 from mightbxg:bugfix_GaussianBlur
Smirnov Egor [Mon, 24 May 2021 14:09:33 +0000 (17:09 +0300)]
add reproducer and bugfix
Xinguang Bian [Fri, 21 May 2021 07:17:20 +0000 (15:17 +0800)]
fix data overflow problem in GaussianBlur
Alexander Alekhin [Wed, 19 May 2021 14:19:53 +0000 (14:19 +0000)]
Merge pull request #20123 from catree:fix_tsai_park_bib_render
catree [Wed, 19 May 2021 12:24:07 +0000 (14:24 +0200)]
Use correct BibTeX syntax for month field.
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
Alexander Alekhin [Mon, 17 May 2021 17:53:34 +0000 (17:53 +0000)]
Merge pull request #20097 from komakai:fix_qrcode_test
Giles Payne [Sun, 16 May 2021 11:52:36 +0000 (20:52 +0900)]
Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test
Alexander Alekhin [Mon, 17 May 2021 07:26:51 +0000 (07:26 +0000)]
Merge pull request #20085 from changh95:fix_typo_calib3d_sample_code
Alexander Alekhin [Mon, 17 May 2021 07:26:25 +0000 (07:26 +0000)]
Merge pull request #20088 from alalek:cmake_module_linker_flags
changh95 [Fri, 14 May 2021 15:22:50 +0000 (00:22 +0900)]
fix typo 'undistorsed'->'undistorted'
Alexander Alekhin [Fri, 14 May 2021 17:39:40 +0000 (17:39 +0000)]
cmake: fix handling of CMAKE_MODULE_LINKER_FLAGS
Alexander Alekhin [Fri, 14 May 2021 06:09:08 +0000 (06:09 +0000)]
Merge pull request #20071 from rogday:depth_fallback_doc
Smirnov Egor [Wed, 12 May 2021 10:18:58 +0000 (13:18 +0300)]
Document imwrite depth fallback
Alexander Alekhin [Tue, 11 May 2021 17:06:11 +0000 (17:06 +0000)]
Merge pull request #20049 from jstaahl:jstaahl-static-inits
Alexander Alekhin [Tue, 11 May 2021 16:34:03 +0000 (16:34 +0000)]
Merge pull request #20053 from berak:core_mat_ptr_vec
berak [Sun, 9 May 2021 12:01:54 +0000 (14:01 +0200)]
core: add missing implementation for Mat::ptr(Vec)
Jake Staahl [Fri, 7 May 2021 19:48:01 +0000 (12:48 -0700)]
Remove static initializers caused by templated static member.
Alexander Alekhin [Fri, 7 May 2021 12:42:16 +0000 (12:42 +0000)]
Merge pull request #20033 from berak:dnn_openpose_py
berak [Wed, 5 May 2021 08:34:42 +0000 (10:34 +0200)]
samples/dnn: better errormsg in openpose.py
Alexander Alekhin [Sat, 1 May 2021 09:35:59 +0000 (09:35 +0000)]
Merge pull request #20018 from lpea:doc_fixes_calib3d
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
Alexander Alekhin [Fri, 30 Apr 2021 17:22:16 +0000 (17:22 +0000)]
Merge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop
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
Alexander Alekhin [Fri, 30 Apr 2021 17:18:51 +0000 (17:18 +0000)]
Merge pull request #20006 from alalek:dnn_ie_gpu_cache_dir
Alexander Alekhin [Fri, 30 Apr 2021 16:06:40 +0000 (16:06 +0000)]
Merge pull request #20014 from alalek:fix_core_tls_process_termination
Alexander Alekhin [Thu, 29 Apr 2021 21:25:42 +0000 (21:25 +0000)]
core(tls): handle process termination / cleanup issues
Alexander Alekhin [Thu, 29 Apr 2021 09:37:14 +0000 (12:37 +0300)]
dnn(ie): implicit usage of IE::GPU OpenCL kernels cache
Alexander Alekhin [Wed, 28 Apr 2021 22:03:14 +0000 (22:03 +0000)]
Merge pull request #19988 from alexkalmuk:fix-squares-cpp-sample
Alexander Alekhin [Wed, 28 Apr 2021 22:02:02 +0000 (22:02 +0000)]
Merge pull request #19984 from sturkmen72:patch-4
Alex Kalmuk [Tue, 27 Apr 2021 08:06:10 +0000 (11:06 +0300)]
Fix squares sample failure when a single file passed
Alexander Alekhin [Tue, 27 Apr 2021 13:31:05 +0000 (13:31 +0000)]
Merge pull request #19979 from micha137:patch-3
micha137 [Mon, 26 Apr 2021 12:01:50 +0000 (14:01 +0200)]
Fix link
Alexander Alekhin [Mon, 26 Apr 2021 22:52:13 +0000 (22:52 +0000)]
Merge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff
Suleyman TURKMEN [Mon, 26 Apr 2021 15:36:51 +0000 (18:36 +0300)]
Update CMakeLists.txt
Alexander Alekhin [Mon, 26 Apr 2021 19:25:56 +0000 (19:25 +0000)]
Merge pull request #19983 from hartmannathan:typo-fix-download
Nathan Hartman [Mon, 26 Apr 2021 15:01:13 +0000 (11:01 -0400)]
Fix typo: 'DOWNLAOD' to 'DOWNLOAD'
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
Alexander Alekhin [Mon, 26 Apr 2021 13:23:29 +0000 (13:23 +0000)]
Merge pull request #19969 from alalek:issue_19850
Zhuo Zhang [Mon, 26 Apr 2021 12:08:45 +0000 (20:08 +0800)]
Fix missing return type for unsafe CV_XADD function
danielenricocahall [Mon, 26 Apr 2021 02:17:07 +0000 (22:17 -0400)]
address template matching sqdiff bug
Alexander Alekhin [Fri, 23 Apr 2021 22:30:06 +0000 (22:30 +0000)]
doxygen: fix quotes in add_toggle macro
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
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
danielenricocahall [Wed, 21 Apr 2021 02:08:01 +0000 (22:08 -0400)]
fix loop boundary condition
Alexander Alekhin [Tue, 20 Apr 2021 17:16:52 +0000 (17:16 +0000)]
Merge pull request #19944 from berak:patch-1
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)
Alexander Alekhin [Thu, 15 Apr 2021 20:45:30 +0000 (20:45 +0000)]
Merge pull request #19908 from CSBVision:patch-2
Alexander Alekhin [Thu, 15 Apr 2021 11:15:37 +0000 (11:15 +0000)]
Merge pull request #19913 from mshabunin:fix-san-build
Maksim Shabunin [Thu, 15 Apr 2021 09:13:15 +0000 (12:13 +0300)]
Fix header sorting for modules without headers
Alexander Alekhin [Wed, 14 Apr 2021 16:14:44 +0000 (16:14 +0000)]
Merge pull request #19886 from alalek:issue_19875