platform/upstream/opencv.git
6 weeks agoAdd python3-setuptools dependency for python 3.12 04/307804/1 accepted/tizen_unified accepted/tizen_unified_x tizen accepted/tizen/unified/20240328.043547 accepted/tizen/unified/x/20240328.090607
JinWang An [Wed, 13 Mar 2024 08:14:21 +0000 (17:14 +0900)]
Add python3-setuptools dependency for python 3.12

Change-Id: I2b4aaa531b386476bf4949cb4af1a4ef2828ff0c
Signed-off-by: JinWang An <jinwang.an@samsung.com>
2 months agoAdd TIZEN_FEATURE_LIBAV to CFLAGS and CXXFLAGS 87/306487/1 accepted/tizen_unified_toolchain accepted/tizen/unified/20240227.054153 accepted/tizen/unified/toolchain/20240311.070051 accepted/tizen/unified/x/20240227.051136
Tae-Young Chung [Thu, 22 Feb 2024 04:12:24 +0000 (13:12 +0900)]
Add TIZEN_FEATURE_LIBAV to CFLAGS and CXXFLAGS

[Version] : 4.7.0-7
[Issue type] : bug fix

Videoio's FFMPEG backend causes segfault while opening a video file.
A root cause is missing 'TIZEN_FEATURE_LIBAV', which is defined in FFMPEG,
from building OpenCV.

Change-Id: I330cc3af6d5ec8a1ed20eb38650bb22f0991280d
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
2 months agoRemove redundant codes 86/306486/1
Tae-Young Chung [Thu, 22 Feb 2024 03:38:02 +0000 (12:38 +0900)]
Remove redundant codes

[Version] : 4.7.0-6
[Issue type] : clean up

A part of a patch with commit
```
commit 60e0136b5538352bc176c94591339b098d2d8d27 (tag: accepted/tizen/unified/20221221.165303)
Author: hj kim <backto.kim@samsung.com>
Date:   Wed Dec 14 18:32:39 2022 +0900

    Fix build error due to upgrade to ffmpeg 5.1.2

    [Version] 4.5.3-5
    [Issue type] Build error fix

    videoio.hpp, cap_ffmpeg_impl.hpp : Get all code from opencv 4.6.0(official release, https://opencv.org/releases/)

    Change-Id: Ib6338e21017ae7404cf82e2b6b707a736ffa43a7
```
is remained after updating to version 4.7.0 so that it is duplicated
with the updated 4.7.0 code.
Instead of reverting the patch, it is just manually removed.

Change-Id: Ic908a00addbd83e8048b214d50f923309a696ac3
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
2 months agoSupport gstreamer when CV_VIDEOIO_BACKEND_GSTREAMER is set to 1 85/306485/1
Tae-Young Chung [Wed, 21 Feb 2024 05:01:55 +0000 (14:01 +0900)]
Support gstreamer when CV_VIDEOIO_BACKEND_GSTREAMER is set to 1

[Version] : 4.7.0-5
[Issue type] : update

As VD's new project request, support gstreamer when
CV_VIDEOIO_BACKEND_GSTREAMER which is newly added to the project
config file is set to 1.

Change-Id: Ied74cadea19b1707038204e6f11b09836480611a
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
4 months agoDisable loading threading backends dynamically 59/303359/2 accepted/tizen_unified_riscv accepted/tizen/unified/20231228.165656 accepted/tizen/unified/20240111.161409 accepted/tizen/unified/riscv/20240103.054601
Tae-Young Chung [Tue, 26 Dec 2023 07:58:50 +0000 (16:58 +0900)]
Disable loading threading backends dynamically

[Version] : 4.7.0-4
[Issue type] : update

https://docs.opencv.org/4.x/db/d05/tutorial_config_reference.html

Change-Id: I77b7fad1a706c1696c16cc1122da8a1607d8ab36
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
6 months agoenable optflow for mediapipe 51/300451/1 accepted/tizen/unified/20231026.032441
sangho park [Wed, 25 Oct 2023 07:15:45 +0000 (16:15 +0900)]
enable optflow for mediapipe

[Version] : 4.7.0-3
[Issue type] : update

mediapipe has a build dependency on optflow

Change-Id: I5e0ecb176048ed959395ca1f2dbe698d06484fd9
Signed-off-by: sangho park <sangho.g.park@samsung.com>
8 months agopackaging: drop BSD license 52/297952/1 accepted/tizen/8.0/unified/20231005.095302 accepted/tizen/unified/20230830.170529 tizen_8.0_m2_release
sangho park [Tue, 29 Aug 2023 06:28:11 +0000 (15:28 +0900)]
packaging: drop BSD license

[Version] : 4.7.0-2
[Issue type] : drop license

Drop BSD license because OpenCV 4.5.0 and higher versions are licensed under the Apache 2 License

Change-Id: I0b54c0ea0a5878f66a14b1f8810de77bd7af8e30
Signed-off-by: sangho park <sangho.g.park@samsung.com>
14 months agoDisable QUIRC QRcode 3rdparty library 13/288713/2 accepted/tizen/unified/20230223.162146
Tae-Young Chung [Wed, 22 Feb 2023 03:27:10 +0000 (12:27 +0900)]
Disable QUIRC QRcode 3rdparty library

[Version] 4.7.0-1
[Issue type] update

QUIRC is QRcode decoding library having ISC License.
Without QUIRC, OpenCV provides QRcode detection only.

Change-Id: I2180e2957e7a9de410a0e150ef137a02228f5445
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
15 months agoBump to 4.7.0 66/287266/1 accepted/tizen/unified/20230127.161057
Tae-Young Chung [Thu, 26 Jan 2023 05:05:03 +0000 (14:05 +0900)]
Bump to 4.7.0

[Version] 4.7.0-0
[Issue type] version up

Change-Id: I602b7d3693863b79ce50c642b921f249f74d5f14
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
15 months agoMerge branch 'upstream/4.7.0' into tizen_opencv_upgrade
Tae-Young Chung [Mon, 9 Jan 2023 06:05:06 +0000 (15:05 +0900)]
Merge branch 'upstream/4.7.0' into tizen_opencv_upgrade

Change-Id: I4e03b2520eca4c053892158aa4fb47ac6a1b7819

15 months agoMerge branch 'tizen' into tizen_opencv_upgrade
Tae-Young Chung [Mon, 9 Jan 2023 00:58:58 +0000 (09:58 +0900)]
Merge branch 'tizen' into tizen_opencv_upgrade

Change-Id: I85d2f4d5d4c6cce58cf04c654e58c0d001ece083

15 months agocopyright: 2023
Alexander Alekhin [Sun, 8 Jan 2023 18:19:37 +0000 (18:19 +0000)]
copyright: 2023

15 months agoMerge "riscv64: Add RISC-V ARCH flag" into tizen accepted/tizen/unified/20230104.172211
Tae-Young Chung [Mon, 2 Jan 2023 02:22:58 +0000 (02:22 +0000)]
Merge "riscv64: Add RISC-V ARCH flag" into tizen

16 months agoMerge tag '4.7.0'
Alexander Alekhin [Wed, 28 Dec 2022 15:23:46 +0000 (15:23 +0000)]
Merge tag '4.7.0'

16 months agorelease: OpenCV 4.7.0
Alexander Smorkalov [Wed, 28 Dec 2022 14:31:52 +0000 (17:31 +0300)]
release: OpenCV 4.7.0

16 months agoMerge pull request #22986 from AleksandrPanov:move_contrib_charuco_to_main_objdetect
Alexander Panov [Wed, 28 Dec 2022 14:28:59 +0000 (17:28 +0300)]
Merge pull request #22986 from AleksandrPanov:move_contrib_charuco_to_main_objdetect

merge with https://github.com/opencv/opencv_contrib/pull/3394

move Charuco API from contrib to main repo:

- add CharucoDetector:
```
CharucoDetector::detectBoard(InputArray image, InputOutputArrayOfArrays markerCorners, InputOutputArray markerIds,
                             OutputArray charucoCorners, OutputArray charucoIds) const // detect charucoCorners and/or markerCorners
CharucoDetector::detectDiamonds(InputArray image, InputOutputArrayOfArrays _markerCorners,
                                InputOutputArrayOfArrays _markerIds, OutputArrayOfArrays _diamondCorners,
                                OutputArray _diamondIds) const
```

- add `matchImagePoints()` for `CharucoBoard`
- remove contrib aruco dependencies from interactive-calibration tool
- move almost all aruco tests to objdetect

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

16 months agoMerge pull request #23050 from zihaomu:fix_memory
Alexander Alekhin [Wed, 28 Dec 2022 10:04:24 +0000 (10:04 +0000)]
Merge pull request #23050 from zihaomu:fix_memory

16 months agoMerge pull request #23049 from alalek:issue_23048
Alexander Alekhin [Wed, 28 Dec 2022 09:54:16 +0000 (09:54 +0000)]
Merge pull request #23049 from alalek:issue_23048

16 months agofix invalid memory access
zihaomu [Wed, 28 Dec 2022 09:16:11 +0000 (17:16 +0800)]
fix invalid memory access

16 months agodnn(openvino): remove undefined status
Alexander Alekhin [Wed, 28 Dec 2022 06:55:00 +0000 (06:55 +0000)]
dnn(openvino): remove undefined status

16 months agoMerge pull request #23043 from AlejandroSilvestri:patch-1
Alexander Alekhin [Tue, 27 Dec 2022 15:33:13 +0000 (15:33 +0000)]
Merge pull request #23043 from AlejandroSilvestri:patch-1

16 months agoAdd missing ORB.setFastThreshold(int) method
AlejandroSilvestri [Tue, 27 Dec 2022 12:39:56 +0000 (09:39 -0300)]
Add missing ORB.setFastThreshold(int) method

ORB constructor is failing to set the very important protected parameter fastThreshold,
so binding this method is necessary.

16 months agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 27 Dec 2022 08:58:28 +0000 (08:58 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

16 months agoMerge tag '3.4.19'
Alexander Alekhin [Tue, 27 Dec 2022 08:41:49 +0000 (08:41 +0000)]
Merge tag '3.4.19'

16 months agorelease: OpenCV 3.4.19
Alexander Alekhin [Tue, 27 Dec 2022 03:50:12 +0000 (03:50 +0000)]
release: OpenCV 3.4.19

16 months agoMerge pull request #23029 from savuor:backport3_fix_fisheye_aspect_ratio
Alexander Alekhin [Tue, 27 Dec 2022 03:47:01 +0000 (03:47 +0000)]
Merge pull request #23029 from savuor:backport3_fix_fisheye_aspect_ratio

16 months agoMerge pull request #23037 from cudawarped:fix_for_cuda_12
Alexander Alekhin [Tue, 27 Dec 2022 03:43:59 +0000 (03:43 +0000)]
Merge pull request #23037 from cudawarped:fix_for_cuda_12

16 months agobackported changes
Rostislav Vasilikhin [Sat, 24 Dec 2022 03:08:43 +0000 (04:08 +0100)]
backported changes

no lambda

whitespace

fixing build Java tests

16 months agoMerge pull request #23039 from alalek:cmake_3.5_fix
Alexander Alekhin [Mon, 26 Dec 2022 20:31:39 +0000 (20:31 +0000)]
Merge pull request #23039 from alalek:cmake_3.5_fix

16 months agocmake: VERSION_GREATER_EQUAL is not supported in CMake 3.5.1
Alexander Alekhin [Mon, 26 Dec 2022 17:41:53 +0000 (17:41 +0000)]
cmake: VERSION_GREATER_EQUAL is not supported in CMake 3.5.1

16 months agoMerge pull request #22905 from zihaomu:clean_up_conv3d_1d
Alexander Alekhin [Mon, 26 Dec 2022 17:39:18 +0000 (17:39 +0000)]
Merge pull request #22905 from zihaomu:clean_up_conv3d_1d

16 months agocuda: fix CUDA 12.0 build errors
cudawarped [Mon, 26 Dec 2022 07:09:25 +0000 (09:09 +0200)]
cuda: fix CUDA 12.0 build errors

16 months agoMerge pull request #23036 from asmorkalov:as/blobdetect_range_fix
Alexander Alekhin [Mon, 26 Dec 2022 12:47:45 +0000 (12:47 +0000)]
Merge pull request #23036 from asmorkalov:as/blobdetect_range_fix

16 months agoMerge pull request #23035 from alalek:update_ffmpeg_4.x
Alexander Smorkalov [Mon, 26 Dec 2022 12:04:55 +0000 (15:04 +0300)]
Merge pull request #23035 from alalek:update_ffmpeg_4.x

ffmpeg/4.x: update FFmpeg wrapper 2022.12

16 months agoFixed blob detector parameters range.
Alexander Smorkalov [Mon, 26 Dec 2022 09:07:00 +0000 (12:07 +0300)]
Fixed blob detector parameters range.

16 months agovideoio(ffmpeg): update tests with new Windows wrapper
Alexander Alekhin [Mon, 26 Dec 2022 02:32:11 +0000 (02:32 +0000)]
videoio(ffmpeg): update tests with new Windows wrapper

16 months agoffmpeg/4.x: update FFmpeg wrapper 2022.12
Alexander Alekhin [Sun, 25 Dec 2022 18:55:19 +0000 (18:55 +0000)]
ffmpeg/4.x: update FFmpeg wrapper 2022.12

- FFmpeg 4.4.3

16 months agoMerge pull request #22972 from alalek:update_version_4.7.0-pre
Alexander Alekhin [Sun, 25 Dec 2022 18:40:27 +0000 (18:40 +0000)]
Merge pull request #22972 from alalek:update_version_4.7.0-pre

16 months agoMerge pull request #22971 from alalek:update_version_3.4.19-pre
Alexander Alekhin [Sun, 25 Dec 2022 18:39:54 +0000 (18:39 +0000)]
Merge pull request #22971 from alalek:update_version_3.4.19-pre

16 months agopre: OpenCV 4.7.0 (version++)
Alexander Alekhin [Thu, 15 Dec 2022 22:08:46 +0000 (22:08 +0000)]
pre: OpenCV 4.7.0 (version++)

16 months agopre: OpenCV 3.4.19 (version++)
Alexander Alekhin [Thu, 15 Dec 2022 21:57:41 +0000 (21:57 +0000)]
pre: OpenCV 3.4.19 (version++)

16 months agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 24 Dec 2022 13:54:58 +0000 (13:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

16 months agoMerge pull request #23028 from zihaomu:update_doc_nanotrack
Alexander Alekhin [Sat, 24 Dec 2022 11:16:46 +0000 (11:16 +0000)]
Merge pull request #23028 from zihaomu:update_doc_nanotrack

16 months agoAdd spaces to make links clickable.
zihaomu [Sat, 24 Dec 2022 07:26:42 +0000 (15:26 +0800)]
Add spaces to make links clickable.

16 months agoMerge pull request #22957 from dkurt:new_openvino_api
Dmitry Kurtaev [Fri, 23 Dec 2022 16:58:41 +0000 (19:58 +0300)]
Merge pull request #22957 from dkurt:new_openvino_api

Switch to new OpenVINO API after 2022.1 release

* Pass Layer_Test_Convolution_DLDT.Accuracy/0 test

* Pass test Test_Caffe_layers.Softmax

* Failed 136 tests

* Fix Concat. Failed 120 tests

* Custom nGraph ops. 19 failed tests

* Set and get properties from Core

* Read model from buffer

* Change MaxPooling layer output names. Restore reshape

* Cosmetic changes

* Cosmetic changes

* Override getOutputsInfo

* Fixes for OpenVINO < 2022.1

* Async inference for 2021.4 and less

* Compile model with config

* Fix serialize for 2022.1

* Asynchronous inference with 2022.1

* Handle 1d outputs

* Work with model with dynamic output shape

* Fixes with 1d output for old API

* Control outputs by nGraph function for all OpenVINO versions

* Refer inputs in PrePostProcessor by indices

* Fix cycled dependency between InfEngineNgraphNode and InfEngineNgraphNet.
Add InferRequest callback only for async inference. Do not capture InferRequest object.

* Fix tests thresholds

* Fix HETERO:GPU,CPU plugin issues with unsupported layer

16 months agoMerge pull request #22965 from vrabaud:numpy_fix
Alexander Smorkalov [Fri, 23 Dec 2022 12:34:02 +0000 (15:34 +0300)]
Merge pull request #22965 from vrabaud:numpy_fix

Remove references to deprecated NumPy type aliases.

16 months agoMerge pull request #22962 from stopmosk:20465-dstchannels-does-not-cover-all-color...
Alexander Alekhin [Fri, 23 Dec 2022 11:41:31 +0000 (11:41 +0000)]
Merge pull request #22962 from stopmosk:20465-dstchannels-does-not-cover-all-color-codes-1

16 months agoMerge pull request #22898 from fengyuentau:slice_neg_steps
Alexander Smorkalov [Fri, 23 Dec 2022 11:15:06 +0000 (14:15 +0300)]
Merge pull request #22898 from fengyuentau:slice_neg_steps

dnn: support ONNX Slice with negative steps by adding and using cv::flipND

16 months agoRemove references to deprecated NumPy type aliases.
Vincent Rabaud [Thu, 15 Dec 2022 10:16:01 +0000 (11:16 +0100)]
Remove references to deprecated NumPy type aliases.

This change replaces references to a number of deprecated NumPy
type aliases (np.bool, np.int, np.float, np.complex, np.object,
np.str) with their recommended replacement (bool, int, float,
complex, object, str).

Those types were deprecated in 1.20 and are removed in 1.24,
cf https://github.com/numpy/numpy/pull/22607.

16 months agoMerge pull request #22930 from MaximMilashchenko:gstreamer_support
Maxim Milashchenko [Fri, 23 Dec 2022 10:15:22 +0000 (13:15 +0300)]
Merge pull request #22930 from MaximMilashchenko:gstreamer_support

Support one-time audio video reading

* stream switching functionality

* audio+video pipeline with switch stream functionality

* audio video sync

* fixed sync

* removed switch swtream functionality

* changed test for gstreamer audio

* fixed error

* fixed error

* fixed issue

* fixed issue

* fixed error

* fixed error

* fixed error

16 months agoMerge pull request #23008 from mshabunin:fix-yolov4-tiny-hash
Alexander Alekhin [Fri, 23 Dec 2022 10:14:25 +0000 (10:14 +0000)]
Merge pull request #23008 from mshabunin:fix-yolov4-tiny-hash

16 months agoDefine the number of dstChannels for Lab, Luv, YCrCb and XYZ conversions
Sergei Shutov [Wed, 14 Dec 2022 21:28:43 +0000 (23:28 +0200)]
Define the number of dstChannels for Lab, Luv, YCrCb and XYZ conversions

16 months agoMerge pull request #23017 from asmorkalov:as/qrcode_valgrind
Alexander Smorkalov [Fri, 23 Dec 2022 09:10:29 +0000 (12:10 +0300)]
Merge pull request #23017 from asmorkalov:as/qrcode_valgrind

Valgrind issues fix in QRCode detector.

16 months agoremove old convolution branch, and optimize conv3d and conv1d.
zihaomu [Fri, 23 Dec 2022 08:50:28 +0000 (16:50 +0800)]
remove old convolution branch, and optimize conv3d and conv1d.

16 months agoadd cv::flipND; support onnx slice with negative steps via cv::flipND
fengyuentau [Thu, 1 Dec 2022 09:41:54 +0000 (17:41 +0800)]
add cv::flipND; support onnx slice with negative steps via cv::flipND

16 months agoValgrind issues fix in QRCode detector.
Alexander Smorkalov [Thu, 22 Dec 2022 14:29:22 +0000 (17:29 +0300)]
Valgrind issues fix in QRCode detector.

16 months agoMerge pull request #23002 from alalek:issue_22206
Alexander Alekhin [Thu, 22 Dec 2022 14:01:21 +0000 (17:01 +0300)]
Merge pull request #23002 from alalek:issue_22206

* obj-c: de-duplicate values of nested enums

- prefix with outer class name

* obj-c: handle enum names change in assigned values

* obj-c: switch on 'const_fix'

* obj-c: add NS_SWIFT_NAME

16 months agodnn: updated YOLOv4-tiny model and tests
Maksim Shabunin [Wed, 21 Dec 2022 12:37:14 +0000 (15:37 +0300)]
dnn: updated YOLOv4-tiny model and tests

16 months agoMerge pull request #23012 from cudawarped/fix_win32_cuda_warning
Alexander Smorkalov [Thu, 22 Dec 2022 11:05:35 +0000 (14:05 +0300)]
Merge pull request #23012 from cudawarped/fix_win32_cuda_warning

Fix nvcc compile errors when built against CUDA SDK < 11.2

16 months agoMerge pull request #22914 from tozanski:tomoz/ransac-bugfix
Alexander Smorkalov [Thu, 22 Dec 2022 08:58:14 +0000 (11:58 +0300)]
Merge pull request #22914 from tozanski:tomoz/ransac-bugfix

Bugfix for solvePnPRansac with SOLVEPNP_ITERATIVE

16 months agoMerge pull request #23014 from alalek:ffmpeg_default_threads
Alexander Alekhin [Thu, 22 Dec 2022 07:57:24 +0000 (07:57 +0000)]
Merge pull request #23014 from alalek:ffmpeg_default_threads

16 months agovideoio(ffmpeg): limit number of default threads
Alexander Alekhin [Thu, 22 Dec 2022 04:36:05 +0000 (04:36 +0000)]
videoio(ffmpeg): limit number of default threads

16 months agoMerge pull request #22993 from alalek:fixup_21738
Alexander Alekhin [Wed, 21 Dec 2022 19:50:51 +0000 (19:50 +0000)]
Merge pull request #22993 from alalek:fixup_21738

16 months agoMerge pull request #23004 from erasta:patch-2
Alexander Alekhin [Wed, 21 Dec 2022 19:49:38 +0000 (19:49 +0000)]
Merge pull request #23004 from erasta:patch-2

16 months agoMerge pull request #23013 from vrabaud:mertens_fix
Alexander Alekhin [Wed, 21 Dec 2022 19:45:58 +0000 (19:45 +0000)]
Merge pull request #23013 from vrabaud:mertens_fix

16 months agoFix self converTo.
Vincent Rabaud [Wed, 21 Dec 2022 17:28:26 +0000 (18:28 +0100)]
Fix self converTo.

We still need images[i] = img because it is used below in buildPyramid.

16 months agobuild: only disable win32 cuda warnings on CUDA SDK >= 11.2
cudawarped [Wed, 21 Dec 2022 15:09:41 +0000 (17:09 +0200)]
build: only disable win32 cuda warnings on CUDA SDK >= 11.2

16 months agoMerge pull request #23009 from asmorkalov:as/aruco_js_update2
Alexander Smorkalov [Wed, 21 Dec 2022 14:43:09 +0000 (17:43 +0300)]
Merge pull request #23009 from asmorkalov:as/aruco_js_update2

Update Javascript bindings for Aruco after migration

16 months agoMerge pull request #22959 from feuerste:parallel_mertens
Marco Feuerstein [Wed, 21 Dec 2022 14:10:59 +0000 (15:10 +0100)]
Merge pull request #22959 from feuerste:parallel_mertens

Parallelize implementation of HDR MergeMertens.

* Parallelize MergeMertens.

* Added performance tests for HDR.

* Ran clang-format.

* Optimizations.

* Fix data path for Windows.

* Remove compiiation warning on Windows.

* Remove clang-format for existing file.

* Addressing reviewer comments.

* Ensure correct summation order.

* Add test for determinism.

* Move result pyramid into sync struct.

* Reuse sync for first loop as well.

* Use OpenCV's threading primitives.

* Remove cout.

16 months agoMerge pull request #22999 from mshabunin:ffmpeg-valgrind-supp
Alexander Alekhin [Wed, 21 Dec 2022 14:08:35 +0000 (14:08 +0000)]
Merge pull request #22999 from mshabunin:ffmpeg-valgrind-supp

16 months agoMerge pull request #23005 from alalek:objdetect_cleanup_aruco_ptr_filestorage
Alexander Smorkalov [Wed, 21 Dec 2022 13:45:14 +0000 (16:45 +0300)]
Merge pull request #23005 from alalek:objdetect_cleanup_aruco_ptr_filestorage

aruco(cleanup): don't use Ptr<FileStorage>

16 months agoMerge pull request #20367 from augustinmanecy:features2d-rw
augustinmanecy [Wed, 21 Dec 2022 13:03:00 +0000 (14:03 +0100)]
Merge pull request #20367 from augustinmanecy:features2d-rw

**Merge with contrib**: https://github.com/opencv/opencv_contrib/pull/3003

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
- [x] The PR is proposed to proper branch
- [ ] There is reference to original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake

16 months agoMerge pull request #22967 from stopmosk:usac-maxiters-bugfix
Alexander Smorkalov [Wed, 21 Dec 2022 12:58:44 +0000 (15:58 +0300)]
Merge pull request #22967 from stopmosk:usac-maxiters-bugfix

Fix maxIter parameter in usac findEssentialMat

16 months agovalgrind: suppressed FFV1 16 bit issue in avcodec-57
Maksim Shabunin [Tue, 20 Dec 2022 22:33:05 +0000 (01:33 +0300)]
valgrind: suppressed FFV1 16 bit issue in avcodec-57

16 months agoUpdate Javascript bindings for Aruco after migration
Alexander Smorkalov [Wed, 21 Dec 2022 12:45:43 +0000 (15:45 +0300)]
Update Javascript bindings for Aruco after migration

16 months agoaruco(cleanup): don't use Ptr<FileStorage>
Alexander Alekhin [Wed, 21 Dec 2022 10:48:06 +0000 (10:48 +0000)]
aruco(cleanup): don't use Ptr<FileStorage>

16 months agoSourceForge folder update
Eran Geva [Wed, 21 Dec 2022 10:26:07 +0000 (12:26 +0200)]
SourceForge folder update

The folder `http://sourceforge.net/projects/opencvlibrary/files/opencv-win/` is stale and wasn't updated since 2018. The parent folder `http://sourceforge.net/projects/opencvlibrary/files/` has fresh windows install exe files.

16 months agoMerge pull request #23001 from alalek:videoio_init_vars
Alexander Smorkalov [Wed, 21 Dec 2022 06:56:55 +0000 (09:56 +0300)]
Merge pull request #23001 from alalek:videoio_init_vars

videoio(v4l): initialize variables

16 months agoFix hardcoded maxIters
Sergei Shutov [Thu, 15 Dec 2022 12:00:48 +0000 (14:00 +0200)]
Fix hardcoded maxIters

16 months agodnn: add the CANN backend (#22634)
Yuantao Feng [Wed, 21 Dec 2022 06:04:41 +0000 (14:04 +0800)]
dnn: add the CANN backend (#22634)

* cann backend impl v1

* cann backend impl v2: use opencv parsers to build models for cann

* adjust fc according to the new transA and transB

* put cann net in cann backend node and reuse forwardLayer

* use fork() to create a child process and compile cann model

* remove legacy code

* remove debug code

* fall bcak to CPU backend if there is one layer not supoorted by CANN backend

* fix netInput forward

16 months agovideoio(v4l): initialize variables
Alexander Alekhin [Wed, 21 Dec 2022 03:28:09 +0000 (03:28 +0000)]
videoio(v4l): initialize variables

16 months agoMerge pull request #22995 from alalek:dnn_fix_opencl_matmul
Alexander Alekhin [Tue, 20 Dec 2022 14:52:35 +0000 (14:52 +0000)]
Merge pull request #22995 from alalek:dnn_fix_opencl_matmul

16 months agoMerge pull request #22963 from cudawarped:replace_texture_ref_with_texture_obj
Alexander Smorkalov [Tue, 20 Dec 2022 12:07:10 +0000 (15:07 +0300)]
Merge pull request #22963 from cudawarped:replace_texture_ref_with_texture_obj

Replace all instances of CUDA texture references with texture objects

16 months agodnn: disable OpenCL code path in MatMul processing
Alexander Alekhin [Tue, 20 Dec 2022 09:46:48 +0000 (09:46 +0000)]
dnn: disable OpenCL code path in MatMul processing

- this mode is not supported by 22828

16 months agoMerge pull request #22994 from alalek:gapi_build_issues
Alexander Alekhin [Tue, 20 Dec 2022 09:42:16 +0000 (09:42 +0000)]
Merge pull request #22994 from alalek:gapi_build_issues

16 months agobuild: eliminate build warnings on Ubuntu 20.04/16.04
Alexander Alekhin [Tue, 20 Dec 2022 06:36:01 +0000 (06:36 +0000)]
build: eliminate build warnings on Ubuntu 20.04/16.04

16 months agodnn: fix gather layer implementation
Alexander Alekhin [Tue, 20 Dec 2022 06:09:34 +0000 (06:09 +0000)]
dnn: fix gather layer implementation

- support FP16 data

16 months agoMerge pull request #22981 from alalek:core_freeze_cache_dir_prefix_4.x
Alexander Alekhin [Mon, 19 Dec 2022 17:29:57 +0000 (17:29 +0000)]
Merge pull request #22981 from alalek:core_freeze_cache_dir_prefix_4.x

16 months agocv::cuda: Replace all instances of texture references/objects with texture objects...
cudawarped [Thu, 15 Dec 2022 06:55:31 +0000 (08:55 +0200)]
cv::cuda: Replace all instances of texture references/objects with texture objects using the existing updated cv::cudev::Texture class.
Fixes bugs in cv::cuda::demosaicing, cv::cuda::resize and cv::cuda::HoughSegmentDetector.

16 months agoMerge pull request #22988 from vrabaud:mm_pause_fix
Alexander Alekhin [Mon, 19 Dec 2022 17:06:50 +0000 (17:06 +0000)]
Merge pull request #22988 from vrabaud:mm_pause_fix

16 months agoEven faster CV_PAUSE on SkyLake and above.
Vincent Rabaud [Mon, 19 Dec 2022 13:15:34 +0000 (14:15 +0100)]
Even faster CV_PAUSE on SkyLake and above.

No need to loop as RDTSC is 3/4 times faster than _mm_pause.

16 months agoMerge pull request #22979 from alalek:fix_videio_test_limit_threads
Alexander Smorkalov [Mon, 19 Dec 2022 07:01:43 +0000 (10:01 +0300)]
Merge pull request #22979 from alalek:fix_videio_test_limit_threads

videoio(test): reduce number of test threads

16 months agoMerge pull request #22935 from alalek:gapi_error
Alexander Alekhin [Mon, 19 Dec 2022 06:05:15 +0000 (09:05 +0300)]
Merge pull request #22935 from alalek:gapi_error

G-API: replace GAPI_Assert() with 'false' and '0' to GAPI_Error()

* gapi: GAPI_Error() macro

* gapi: replace GAPI_Assert() with 'false' and '0' to GAPI_Error()

* build: eliminate 'unreachable code' after CV_Error() (MSVC 2015)

* build: eliminate 'unreachable code' warning for MSVS 2015/2017

- observed in constructors stubs with throwing exception

16 months agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 18 Dec 2022 02:16:17 +0000 (02:16 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

16 months agoMerge pull request #22980 from alalek:samples_python_3.11
Alexander Alekhin [Sun, 18 Dec 2022 02:07:46 +0000 (02:07 +0000)]
Merge pull request #22980 from alalek:samples_python_3.11

16 months agocore: freeze cache directory prefix - "4.x"
Alexander Alekhin [Sun, 18 Dec 2022 00:24:52 +0000 (00:24 +0000)]
core: freeze cache directory prefix - "4.x"

16 months agosamples: query for Python 3.11 setup
Alexander Alekhin [Sun, 18 Dec 2022 00:14:41 +0000 (00:14 +0000)]
samples: query for Python 3.11 setup

16 months agovideoio(test): reduce number of test threads
Alexander Alekhin [Sun, 18 Dec 2022 00:02:07 +0000 (00:02 +0000)]
videoio(test): reduce number of test threads

16 months agoMerge pull request #22934 from alalek:fix_filestorage_binding
Alexander Alekhin [Sat, 17 Dec 2022 03:28:13 +0000 (03:28 +0000)]
Merge pull request #22934 from alalek:fix_filestorage_binding

16 months agoMerge pull request #22880 from cudawarped:remember_cudacodec_lib_locations
Alexander Smorkalov [Fri, 16 Dec 2022 09:30:03 +0000 (12:30 +0300)]
Merge pull request #22880 from cudawarped:remember_cudacodec_lib_locations

Prevent cudacodec libs locations being reset when cmake is re-run