platform/upstream/opencv.git
2 years agoMerge pull request #22080 from vrabaud:fix_arm
Alexander Alekhin [Mon, 13 Jun 2022 18:17:24 +0000 (18:17 +0000)]
Merge pull request #22080 from vrabaud:fix_arm

2 years agoFix compilation on some ARM architecture.
Vincent Rabaud [Wed, 8 Jun 2022 14:29:47 +0000 (16:29 +0200)]
Fix compilation on some ARM architecture.

This condition is the same as the line above.

2 years agoMerge tag '3.4.18'
Alexander Alekhin [Sun, 5 Jun 2022 15:16:54 +0000 (15:16 +0000)]
Merge tag '3.4.18'

2 years agorelease: OpenCV 3.4.18
Alexander Alekhin [Sun, 5 Jun 2022 07:52:44 +0000 (07:52 +0000)]
release: OpenCV 3.4.18

2 years agoMerge pull request #22025 from AleksandrPanov:fix_samplingForVersion_multiplyingFactor
Alexander Panov [Sat, 4 Jun 2022 14:33:08 +0000 (17:33 +0300)]
Merge pull request #22025 from AleksandrPanov:fix_samplingForVersion_multiplyingFactor

Fix sampling for version multiplying factor

* reduce experimentalFrequencyElem and listFrequencyElem

* fix large resize

* fix tile in postIntermediate

* add getMinSideLen(), add corrected_index

* add test decode_regression_21929 author Kumataro, add test decode_regression_version_25

2 years agoMerge pull request #22061 from alalek:imgproc_color_hsv_use_singleton
Alexander Alekhin [Fri, 3 Jun 2022 09:03:33 +0000 (09:03 +0000)]
Merge pull request #22061 from alalek:imgproc_color_hsv_use_singleton

2 years agoimgproc: use singleton in color_hsv.simd.hpp
Alexander Alekhin [Wed, 1 Jun 2022 19:02:56 +0000 (19:02 +0000)]
imgproc: use singleton in color_hsv.simd.hpp

2 years agoMerge pull request #22059 from Kumataro:3.4-fix21899
Alexander Alekhin [Wed, 1 Jun 2022 18:38:22 +0000 (18:38 +0000)]
Merge pull request #22059 from Kumataro:3.4-fix21899

2 years agohighgui: Qt: waitKey() supports Cyrillic/Japanese keyboard layout
Kumataro [Wed, 1 Jun 2022 12:45:53 +0000 (21:45 +0900)]
highgui: Qt: waitKey() supports Cyrillic/Japanese keyboard layout

2 years agoMerge pull request #22030 from Kumataro:3.4-fix22029
Kumataro [Tue, 31 May 2022 10:58:17 +0000 (19:58 +0900)]
Merge pull request #22030 from Kumataro:3.4-fix22029

* objdetect: qrcode_encoder: fix to missing timing pattern

* objdetect: qrcode_encoder: Add SCOPED_TRACE() and replace CV_Assert() to ASSERT_EQ().

- Add SCOPED_TRACE() for version loop.

- Replace CV_Assert() to ASSERT_EQ().

- Rename expect_msg to msg.

2 years agoMerge pull request #22054 from asenyaev:asen/fix_matching_xcode_version
Alexander Alekhin [Tue, 31 May 2022 06:39:09 +0000 (06:39 +0000)]
Merge pull request #22054 from asenyaev:asen/fix_matching_xcode_version

2 years agoFix Xcode version matching
Andrey Senyaev [Mon, 30 May 2022 22:58:50 +0000 (01:58 +0300)]
Fix Xcode version matching

2 years agoMerge pull request #22045 from victor1234:calib3d-fisheye-model-reference
Victor [Mon, 30 May 2022 18:03:08 +0000 (21:03 +0300)]
Merge pull request #22045 from victor1234:calib3d-fisheye-model-reference

* Add fisheye camera model summary description with reference

* Fix layout

* Move reference to bibtex

2 years agoMerge pull request #21843 from Rufflewind:doc
Alexander Alekhin [Sat, 28 May 2022 11:44:19 +0000 (11:44 +0000)]
Merge pull request #21843 from Rufflewind:doc

2 years agoMerge pull request #22035 from mohawk2:patch-1
Alexander Alekhin [Thu, 26 May 2022 19:15:39 +0000 (19:15 +0000)]
Merge pull request #22035 from mohawk2:patch-1

2 years agotypo: Minkowsky is actually Minkowski
mohawk2 [Wed, 25 May 2022 14:23:10 +0000 (15:23 +0100)]
typo: Minkowsky is actually Minkowski

2 years agoMerge pull request #22026 from alalek:update_version_3.4.18-pre
Alexander Alekhin [Tue, 24 May 2022 20:23:27 +0000 (20:23 +0000)]
Merge pull request #22026 from alalek:update_version_3.4.18-pre

2 years agoMerge pull request #22006 from rogday:21947_fix
Alexander Alekhin [Tue, 24 May 2022 19:26:02 +0000 (19:26 +0000)]
Merge pull request #22006 from rogday:21947_fix

2 years agoMerge pull request #22024 from berak:patch-1
Alexander Alekhin [Tue, 24 May 2022 08:20:26 +0000 (08:20 +0000)]
Merge pull request #22024 from berak:patch-1

2 years agofix vector access in TF::sortByExecutionOrder
rogday [Wed, 18 May 2022 20:52:56 +0000 (23:52 +0300)]
fix vector access in TF::sortByExecutionOrder

2 years agopre: OpenCV 3.4.18 (version++)
Alexander Alekhin [Mon, 23 May 2022 19:18:02 +0000 (19:18 +0000)]
pre: OpenCV 3.4.18 (version++)

2 years agoUpdate darknet_importer.cpp
berak [Mon, 23 May 2022 17:18:31 +0000 (19:18 +0200)]
Update darknet_importer.cpp

make it more obvious, that this is a '404', not a 'parsing' problem

2 years agoMerge pull request #21818 from rogday:revert_renaming
rogday [Mon, 23 May 2022 14:50:42 +0000 (17:50 +0300)]
Merge pull request #21818 from rogday:revert_renaming

* add prefixes to layer names and layer output names

* dnn: OPENCV_DNN_ONNX_USE_LEGACY_NAMES runtime parameter

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2 years agoUpdate js_usage.markdown to use onRuntimeInitialized
Phil Ruffwind [Sat, 9 Apr 2022 05:48:03 +0000 (22:48 -0700)]
Update js_usage.markdown to use onRuntimeInitialized

The Emscripten library is not guaranteed to be fully loaded during the
script element's onload event. Module.onRuntimeInitialized seems to be
more reliable.

2 years agoMerge pull request #22001 from asenyaev:asen/move_workflows
Alexander Alekhin [Sun, 22 May 2022 13:41:56 +0000 (13:41 +0000)]
Merge pull request #22001 from asenyaev:asen/move_workflows

2 years agoMove workflows to a dedicated repository
Andrey Senyaev [Fri, 20 May 2022 11:29:43 +0000 (14:29 +0300)]
Move workflows to a dedicated repository

2 years agoMerge pull request #21988 from alalek:fix_warnings_gcc12_3.4
Alexander Alekhin [Tue, 17 May 2022 16:27:15 +0000 (16:27 +0000)]
Merge pull request #21988 from alalek:fix_warnings_gcc12_3.4

2 years agoMerge pull request #21998 from alalek:gha_fix_git_merge_fixup_21986
Alexander Alekhin [Tue, 17 May 2022 16:24:25 +0000 (16:24 +0000)]
Merge pull request #21998 from alalek:gha_fix_git_merge_fixup_21986

2 years agoMerge pull request #21994 from asenyaev:asen/extra_dnn_testing
Andrey Senyaev [Tue, 17 May 2022 16:23:32 +0000 (19:23 +0300)]
Merge pull request #21994 from asenyaev:asen/extra_dnn_testing

Extended DNN testing in GHA

* Extended DNN testing in GHA for 3.4 branch

* Updated docker images in Linux GitHub Actions

* Added OPENCV_DOWNLOAD_PATH flag for ARM build to use pre-downloaded binaries

2 years agoGHA: fix git merge (part 2)
Alexander Alekhin [Tue, 17 May 2022 14:53:04 +0000 (14:53 +0000)]
GHA: fix git merge (part 2)

2 years agoMerge pull request #21986 from alalek:gha_fix_git_merge
Alexander Alekhin [Mon, 16 May 2022 14:35:55 +0000 (14:35 +0000)]
Merge pull request #21986 from alalek:gha_fix_git_merge

2 years agobuild: GCC12 warnings
Alexander Alekhin [Sun, 15 May 2022 16:20:45 +0000 (16:20 +0000)]
build: GCC12 warnings

2 years agoGHA: fix git merge
Alexander Alekhin [Sun, 15 May 2022 09:35:38 +0000 (09:35 +0000)]
GHA: fix git merge

2 years agoMerge pull request #21980 from asenyaev:asen/move_variables_to_the_host
OpenCV Pushbot [Sat, 14 May 2022 11:03:17 +0000 (11:03 +0000)]
Merge pull request #21980 from asenyaev:asen/move_variables_to_the_host

2 years agoMove environment variables on a host side (GHA Windows)
Andrey Senyaev [Fri, 13 May 2022 15:14:45 +0000 (18:14 +0300)]
Move environment variables on a host side (GHA Windows)

2 years agoMerge pull request #21977 from asenyaev:asen/win_contrib
OpenCV Pushbot [Fri, 13 May 2022 20:59:51 +0000 (20:59 +0000)]
Merge pull request #21977 from asenyaev:asen/win_contrib

2 years agoMerge pull request #21964 from Julian-Sz:patch-1
OpenCV Pushbot [Fri, 13 May 2022 18:13:30 +0000 (18:13 +0000)]
Merge pull request #21964 from Julian-Sz:patch-1

Documentation Fix: Python and Java switched in Explanation

2 years agoAdded opencv_contrib branch check on Windows
Andrey Senyaev [Fri, 13 May 2022 12:38:51 +0000 (15:38 +0300)]
Added opencv_contrib branch check on Windows

2 years agoMerge pull request #21975 from asenyaev:asen/fix_terminating_windows_actions
OpenCV Pushbot [Fri, 13 May 2022 17:34:30 +0000 (17:34 +0000)]
Merge pull request #21975 from asenyaev:asen/fix_terminating_windows_actions

2 years agoMerge pull request #21935 from Yulv-git:3.4-typos3
OpenCV Pushbot [Fri, 13 May 2022 17:30:57 +0000 (17:30 +0000)]
Merge pull request #21935 from Yulv-git:3.4-typos3

2 years agoMerge pull request #21933 from Yulv-git:3.4-typos1
OpenCV Pushbot [Fri, 13 May 2022 17:28:08 +0000 (17:28 +0000)]
Merge pull request #21933 from Yulv-git:3.4-typos1

2 years agoMerge pull request #21924 from fengyuentau:workflow_arm64_3.4
Yuantao Feng [Fri, 13 May 2022 17:27:01 +0000 (01:27 +0800)]
Merge pull request #21924 from fengyuentau:workflow_arm64_3.4

Workflow to build and test on ARM64 for 3.4 branch

* add ARM64 workflow for 3.4

* add opencv_contrib fork check

* rename RET to OPENCV_EXTRA_FORK

2 years agoMerge pull request #21871 from xiongzhen:apply-predictor-to-lzw-only
OpenCV Pushbot [Fri, 13 May 2022 17:25:59 +0000 (17:25 +0000)]
Merge pull request #21871 from xiongzhen:apply-predictor-to-lzw-only

TIFFTAG_PREDICTOR should not be applied unless LZW, DEFLATE or ADOBE_DEFLATE

2 years agoMerge pull request #21847 from lamm45:imgproc-tform-doc
OpenCV Pushbot [Fri, 13 May 2022 17:23:23 +0000 (17:23 +0000)]
Merge pull request #21847 from lamm45:imgproc-tform-doc

Minor documentation fixes for geometric image transformations

2 years agoApply TIFFTAG_PREDICTOR option for LZW, DEFLATE and ADOBE_DEFLATE compression cases...
xiongzhen [Fri, 13 May 2022 06:44:25 +0000 (09:44 +0300)]
Apply TIFFTAG_PREDICTOR option for LZW, DEFLATE and ADOBE_DEFLATE compression cases for smaller files.

2 years agoMoved from https to ssh for Windows in Github Actions
Andrey Senyaev [Thu, 12 May 2022 22:37:55 +0000 (01:37 +0300)]
Moved from https to ssh for Windows in Github Actions

2 years agoFix: Python and Java switched in Explanation
Julian Szigethy [Tue, 10 May 2022 16:11:27 +0000 (18:11 +0200)]
Fix: Python and Java switched in Explanation

2 years agoMerge pull request #21916 from chenjunnn:patch-1
OpenCV Pushbot [Thu, 12 May 2022 10:01:11 +0000 (10:01 +0000)]
Merge pull request #21916 from chenjunnn:patch-1

2 years agoMerge pull request #21963 from hellodoge:imwrite_fix
OpenCV Pushbot [Thu, 12 May 2022 09:02:54 +0000 (09:02 +0000)]
Merge pull request #21963 from hellodoge:imwrite_fix

2 years agoMerge pull request #21954 from Darkyenus:patch-1
OpenCV Pushbot [Thu, 12 May 2022 08:59:10 +0000 (08:59 +0000)]
Merge pull request #21954 from Darkyenus:patch-1

2 years agoMerge pull request #21917 from asenyaev:asen/self_hosted_runner_linux_3.4
Andrey Senyaev [Thu, 12 May 2022 08:52:23 +0000 (11:52 +0300)]
Merge pull request #21917 from asenyaev:asen/self_hosted_runner_linux_3.4

Workflow to use a self-hosted Github runner on Linux x86_64 for 3.4 branch

* Changed a workflow to use a self-hosted Github runner for 3.4 branch

2 years agoFix KalmanFilter comment error
Chen Jun [Wed, 27 Apr 2022 10:13:57 +0000 (18:13 +0800)]
Fix KalmanFilter comment error

If there will be measurement before the next predict, `statePost` would be assigned to updated value. So I guess these steps are meant to handle when no measurement and KF only do the predict step.
```cpp
statePre.copyTo(statePost);
errorCovPre.copyTo(errorCovPost);
```

2 years agoMerge pull request #21974 from cxcorp:fix-js-test-globals
OpenCV Pushbot [Thu, 12 May 2022 08:44:00 +0000 (08:44 +0000)]
Merge pull request #21974 from cxcorp:fix-js-test-globals

2 years agoMerge pull request #21882 from duanqn:improve-doc
OpenCV Pushbot [Thu, 12 May 2022 07:41:39 +0000 (07:41 +0000)]
Merge pull request #21882 from duanqn:improve-doc

2 years agoMerge pull request #21970 from asenyaev:asen/filtering_tests_3.4
OpenCV Pushbot [Thu, 12 May 2022 07:39:05 +0000 (07:39 +0000)]
Merge pull request #21970 from asenyaev:asen/filtering_tests_3.4

GTest filtered list for 3.4 branch

2 years agoFix global variable assignment in JS test suite
Joona Heikkilä [Wed, 11 May 2022 20:15:34 +0000 (23:15 +0300)]
Fix global variable assignment in JS test suite

In test_imgproc.js, the test_filter suite's last test assigns a variable
to `size` without declaring it with `let`, polluting the global scope.
This commit adds `let` to the statement, so that the variable is scoped
to the test block.

2 years agoGTest filtered list
Andrey Senyaev [Wed, 11 May 2022 14:53:40 +0000 (17:53 +0300)]
GTest filtered list

2 years agoSmall imencode documentation improvement
Jan Polák [Fri, 6 May 2022 12:41:52 +0000 (14:41 +0200)]
Small imencode documentation improvement

It was previously not clear that the extension should include the period, [and I am not the only person that encountered this problem](https://stackoverflow.com/questions/4254460/opencv-could-not-find-encoder-for-the-specified-extension).

I assume that this is true for all supported extensions, but I haven't checked the source.

2 years agofix JpegEncoder::write
hellodoge [Mon, 9 May 2022 12:52:43 +0000 (15:52 +0300)]
fix JpegEncoder::write

3rdparty/libjpeg-turbo/src/jpeglib.h:
`* NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.`

2 years agoMerge pull request #21943 from vrabaud:3.4_proc
Vincent Rabaud [Thu, 5 May 2022 07:59:29 +0000 (09:59 +0200)]
Merge pull request #21943 from vrabaud:3.4_proc

* Fix compilation with non glibc.

_SC_NPROCESSORS_ONLN is non standard as defined on https://man7.org/linux/man-pages/man3/sysconf.3.html
It seems to only be on glibc, cf https://www.gnu.org/software/libc/manual/html_node/Processor-Resources.html

* Fix to defined(_SC_NPROCESSORS_ONLN)

2 years agoFix some typos in modules/.
Yulv-git [Sat, 30 Apr 2022 05:40:07 +0000 (13:40 +0800)]
Fix some typos in modules/.

2 years agoFix some typos in doc.
Yulv-git [Sat, 30 Apr 2022 05:29:25 +0000 (13:29 +0800)]
Fix some typos in doc.

2 years agoMerge pull request #21856 from LaurentBerger:I21853
OpenCV Pushbot [Fri, 29 Apr 2022 18:18:02 +0000 (18:18 +0000)]
Merge pull request #21856 from LaurentBerger:I21853

Try to solve I21853 mouse wheel problem with GTK3

2 years agoMerge pull request #21920 from asenyaev:asen/contrib_fork_check
OpenCV Pushbot [Fri, 29 Apr 2022 18:14:06 +0000 (18:14 +0000)]
Merge pull request #21920 from asenyaev:asen/contrib_fork_check

2 years agoTry to solve I21853 mouse wheel problem with GTK3
LaurentBerger [Tue, 12 Apr 2022 11:48:33 +0000 (13:48 +0200)]
Try to solve I21853 mouse wheel problem with GTK3

2 years agoMerge pull request #21888 from asenyaev:asen/workflow_only_windows_3.4
Andrey Senyaev [Thu, 28 Apr 2022 19:07:07 +0000 (22:07 +0300)]
Merge pull request #21888 from asenyaev:asen/workflow_only_windows_3.4

Added workflow for Github Actions to build and test OpenCV on Windows for 3.4 branch

* Added workflow for Github Actions to build and test OpenCV on Windows

* Updated Github Actions for 3.4 branch on Windows using self-hosted runner

* Fixed url for a fork in Windows workflow (3.4 branch)

* opencv_extra fork usage in Github Actions

2 years agoopencv_contrib fork usage in Github Actions (3.4 branch)
Andrey Senyaev [Thu, 28 Apr 2022 13:19:00 +0000 (16:19 +0300)]
opencv_contrib fork usage in Github Actions (3.4 branch)

2 years agoMerge pull request #21914 from asenyaev:asen/fork_opencv_extra
OpenCV Pushbot [Wed, 27 Apr 2022 17:25:30 +0000 (17:25 +0000)]
Merge pull request #21914 from asenyaev:asen/fork_opencv_extra

2 years agoopencv_extra fork usage in Github Actions
Andrey Senyaev [Tue, 26 Apr 2022 11:05:21 +0000 (14:05 +0300)]
opencv_extra fork usage in Github Actions

2 years agoMerge pull request #21904 from asenyaev:asen/fix_fork_url
OpenCV Pushbot [Mon, 25 Apr 2022 19:06:52 +0000 (19:06 +0000)]
Merge pull request #21904 from asenyaev:asen/fix_fork_url

2 years agoFixed url for a fork
Andrey Senyaev [Sat, 23 Apr 2022 22:44:15 +0000 (01:44 +0300)]
Fixed url for a fork

2 years agoMerge pull request #21875 from asenyaev:asen/workflow_only_linux
Andrey Senyaev [Thu, 21 Apr 2022 14:59:56 +0000 (17:59 +0300)]
Merge pull request #21875 from asenyaev:asen/workflow_only_linux

Added workflow for Github Actions to build and test OpenCV on Linux

* Added workflow for Github Actions to build and test OpenCV

* Merged a build and tests in one job, changed naming

* Renamed job names, split workflows by branch, removed and added some cmake flags, save unit tests results as a html file

* Split tests by steps, removed workflows for 4.x and 5.x branches

2 years agoRemove extra not in doc
Qingnan Duan [Mon, 18 Apr 2022 06:18:27 +0000 (14:18 +0800)]
Remove extra not in doc

2 years agoMerge pull request #21873 from asmorkalov:as/jpeg_options
OpenCV Pushbot [Fri, 15 Apr 2022 18:49:49 +0000 (18:49 +0000)]
Merge pull request #21873 from asmorkalov:as/jpeg_options

Document defaults for JPEG settings.

2 years agoDocument defaults for JPEG settings.
Alexander Smorkalov [Fri, 15 Apr 2022 11:36:48 +0000 (14:36 +0300)]
Document defaults for JPEG settings.

2 years agoMerge pull request #21861 from rogday:21852_fix
OpenCV Pushbot [Thu, 14 Apr 2022 09:59:44 +0000 (09:59 +0000)]
Merge pull request #21861 from rogday:21852_fix

Add assert to address tf simplifier security concerns

2 years agoadd assert to tf graph simplifier to address security concerns
rogday [Wed, 13 Apr 2022 12:55:36 +0000 (15:55 +0300)]
add assert to tf graph simplifier to address security concerns

2 years agoMerge pull request #21855 from opencv-pushbot:dnn_test_update_checks_face_detector_3.4
OpenCV Pushbot [Tue, 12 Apr 2022 17:33:13 +0000 (17:33 +0000)]
Merge pull request #21855 from opencv-pushbot:dnn_test_update_checks_face_detector_3.4

2 years agodnn(test): update opencv_face_detector checks
OpenCV Developers [Mon, 11 Apr 2022 19:14:33 +0000 (19:14 +0000)]
dnn(test): update opencv_face_detector checks

original commit: be4a432bea6f714bf14c8d9a4883b56d0effb4a0

2 years agoFix some doc references in geometric image transformations module
lamm45 [Sun, 10 Apr 2022 17:13:30 +0000 (13:13 -0400)]
Fix some doc references in geometric image transformations module

2 years agoMerge pull request #21820 from alalek:fix_videoio_ffmpeg_memory_leak_3.4
Alexander Alekhin [Tue, 5 Apr 2022 18:03:27 +0000 (18:03 +0000)]
Merge pull request #21820 from alalek:fix_videoio_ffmpeg_memory_leak_3.4

2 years agoMerge pull request #21779 from eplankin:fix_11303
eplankin [Tue, 5 Apr 2022 15:58:15 +0000 (18:58 +0300)]
Merge pull request #21779 from eplankin:fix_11303

Fixed out-of-bounds read in parallel version of ippGaussianBlur()

* Fixed out-of-memory read in parallel version of ippGaussianBlur()

* Fixed check

* Revert changes in CMakeLists.txt

2 years agoMerge pull request #21821 from alalek:update_zlib
Alexander Alekhin [Tue, 5 Apr 2022 11:29:36 +0000 (14:29 +0300)]
Merge pull request #21821 from alalek:update_zlib

* 3rdparty: zlib 1.2.11 => 1.2.12

https://github.com/madler/zlib/releases/tag/v1.2.12

* 3rdparty(zlib): re-apply patch 20190330-ununitialized-use-state-check.diff

2 years agovideoio(ffmpeg): avoid memory leaks
Alexander Alekhin [Fri, 1 Apr 2022 18:02:14 +0000 (18:02 +0000)]
videoio(ffmpeg): avoid memory leaks

2 years agoMerge pull request #21795 from alalek:dnn_test_update_openvino_3.4
Alexander Alekhin [Sat, 2 Apr 2022 19:36:48 +0000 (19:36 +0000)]
Merge pull request #21795 from alalek:dnn_test_update_openvino_3.4

2 years agodnn(test): update OpenVINO tests 2022.1.0
Alexander Alekhin [Wed, 30 Mar 2022 19:03:38 +0000 (19:03 +0000)]
dnn(test): update OpenVINO tests 2022.1.0

2 years agoMerge pull request #21798 from gititgo:4.x
Alexander Alekhin [Fri, 1 Apr 2022 22:11:57 +0000 (22:11 +0000)]
Merge pull request #21798 from gititgo:4.x

2 years agoMerge pull request #21794 from yash112-lang:3.4
Alexander Alekhin [Fri, 1 Apr 2022 22:10:50 +0000 (22:10 +0000)]
Merge pull request #21794 from yash112-lang:3.4

2 years agofix MSA sum overflow issue
shengwenxue [Wed, 30 Mar 2022 03:29:01 +0000 (11:29 +0800)]
fix MSA sum overflow issue

2 years agoUpdate Condition
Yash Singhal [Wed, 30 Mar 2022 06:11:50 +0000 (11:41 +0530)]
Update Condition

Update connectedcomponents.cpp

2 years agodnn(test): update OpenVINO tests 2021.4.2
Alexander Alekhin [Wed, 30 Mar 2022 10:47:59 +0000 (10:47 +0000)]
dnn(test): update OpenVINO tests 2021.4.2

2 years agoMerge pull request #21785 from alalek:python_fix_subclass_order
Alexander Alekhin [Mon, 28 Mar 2022 12:16:56 +0000 (12:16 +0000)]
Merge pull request #21785 from alalek:python_fix_subclass_order

2 years agopython: ensure publishing of subclasses before derived types
Alexander Alekhin [Sun, 27 Mar 2022 12:48:49 +0000 (12:48 +0000)]
python: ensure publishing of subclasses before derived types

2 years agoMerge pull request #21750 from alalek:dnn_fix_index_access
Alexander Alekhin [Fri, 25 Mar 2022 18:26:10 +0000 (18:26 +0000)]
Merge pull request #21750 from alalek:dnn_fix_index_access

2 years agoMerge pull request #21759 from pkubaj:patch-1
Alexander Alekhin [Wed, 23 Mar 2022 19:13:12 +0000 (19:13 +0000)]
Merge pull request #21759 from pkubaj:patch-1

2 years agoMerge pull request #21739 from mshabunin:fix-cart-polar
Alexander Alekhin [Mon, 21 Mar 2022 17:10:11 +0000 (17:10 +0000)]
Merge pull request #21739 from mshabunin:fix-cart-polar

2 years agocartToPolar/polarToCart: disable inplace mode
Maksim Shabunin [Thu, 17 Mar 2022 13:14:38 +0000 (16:14 +0300)]
cartToPolar/polarToCart: disable inplace mode

2 years agots: fix some EXPECT_MAT macros
Maksim Shabunin [Mon, 21 Mar 2022 13:04:33 +0000 (16:04 +0300)]
ts: fix some EXPECT_MAT macros

2 years agoFix build with LLVM 13 on ppc64le
pkubaj [Mon, 21 Mar 2022 02:05:05 +0000 (02:05 +0000)]
Fix build with LLVM 13 on ppc64le

/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:352:12: warning: 'vec_permi' macro redefined [-Wmacro-redefined]
#   define vec_permi(a, b, c) vec_xxpermdi(b, a, (3 ^ (((c) & 1) << 1 | (c) >> 1)))
           ^
/usr/lib/clang/13.0.0/include/altivec.h:13077:9: note: previous definition is here
#define vec_permi(__a, __b, __c)                                               \
        ^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:370:25: error: redefinition of 'vec_promote'
VSX_FINLINE(vec_dword2) vec_promote(long long a, int b)
                        ^
/usr/lib/clang/13.0.0/include/altivec.h:14604:1: note: previous definition is here
vec_promote(signed long long __a, int __b) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:377:26: error: redefinition of 'vec_promote'
VSX_FINLINE(vec_udword2) vec_promote(unsigned long long a, int b)
                         ^
/usr/lib/clang/13.0.0/include/altivec.h:14611:1: note: previous definition is here
vec_promote(unsigned long long __a, int __b) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/hal/intrin_vsx.hpp:1045:22: error: call to 'vec_rsqrt' is ambiguous
{ return v_float32x4(vec_rsqrt(x.val)); }
                     ^~~~~~~~~
/usr/lib/clang/13.0.0/include/altivec.h:8472:34: note: candidate function
static vector float __ATTRS_o_ai vec_rsqrt(vector float __a) {
                                 ^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:362:29: note: candidate function
    VSX_FINLINE(vec_float4) vec_rsqrt(const vec_float4& a)
                            ^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/hal/intrin_vsx.hpp:1047:22: error: call to 'vec_rsqrt' is ambiguous
{ return v_float64x2(vec_rsqrt(x.val)); }
                     ^~~~~~~~~
/usr/lib/clang/13.0.0/include/altivec.h:8477:35: note: candidate function
static vector double __ATTRS_o_ai vec_rsqrt(vector double __a) {
                                  ^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:365:30: note: candidate function
    VSX_FINLINE(vec_double2) vec_rsqrt(const vec_double2& a)
                             ^
1 warning and 4 errors generated.

The specific functions were added to altivec.h in LLVM's 1ff93618e58df210def48d26878c20a1b414d900c3da07d216dd20fbdb7302fd085c0a59e189ae3d and 10cc5bcd868c433f9a781aef82178b04e98bd098.

2 years agodnn: fix index access
Alexander Alekhin [Sat, 19 Mar 2022 06:52:47 +0000 (06:52 +0000)]
dnn: fix index access