platform/upstream/opencv.git
2 years agobuild: winpack_dldt with dldt 2021.4.1
Alexander Alekhin [Fri, 10 Sep 2021 20:58:37 +0000 (20:58 +0000)]
build: winpack_dldt with dldt 2021.4.1

2 years agoMerge pull request #20646 from VadimLevin:dev/vlevin/fix-vector-conversion
Alexander Alekhin [Thu, 2 Sep 2021 09:30:56 +0000 (09:30 +0000)]
Merge pull request #20646 from VadimLevin:dev/vlevin/fix-vector-conversion

2 years agofix: NumPy array allocation error message in vector conversion
Vadim Levin [Thu, 2 Sep 2021 07:32:17 +0000 (10:32 +0300)]
fix: NumPy array allocation error message in vector conversion

2 years agoMerge pull request #20573 from rogday:onnx_scale_fix
Alexander Alekhin [Wed, 1 Sep 2021 14:09:17 +0000 (14:09 +0000)]
Merge pull request #20573 from rogday:onnx_scale_fix

2 years agoMerge pull request #20618 from VadimLevin:dev/vlevin/fix-vector-conversion
Alexander Alekhin [Wed, 1 Sep 2021 10:52:37 +0000 (10:52 +0000)]
Merge pull request #20618 from VadimLevin:dev/vlevin/fix-vector-conversion

2 years agoMerge pull request #20511 from wjj19950828:add_humanseg_support_0806
WJJ1995 [Wed, 1 Sep 2021 10:10:05 +0000 (18:10 +0800)]
Merge pull request #20511 from wjj19950828:add_humanseg_support_0806

* support PPSeg model for dnn module

* fixed README for CI

* add test case

* fixed bug

* deal with comments

* rm dnn_model_runner

* update test case

* fixed bug for testcase

* update testcase

2 years agofeat: update conversion logic for `std::vector<T>` in Python bindings
Vadim Levin [Fri, 27 Aug 2021 12:01:09 +0000 (15:01 +0300)]
feat: update conversion logic for `std::vector<T>` in Python bindings

`PyObject*` to `std::vector<T>` conversion logic:
- If user passed Numpy Array
  - If array is planar and T is a primitive type (doesn't require
    constructor call) that matches with the element type of array, then
    copy element one by one with the respect of the step between array
    elements. If compiler is lucky (or brave enough) copy loop can be
    vectorized.
    For classes that require constructor calls this path is not
    possible, because we can't begin an object lifetime without hacks.
  - Otherwise fall-back to general case
- Otherwise - execute the general case:
  If PyObject* corresponds to Sequence protocol - iterate over the
  sequence elements and invoke the appropriate `pyopencv_to` function.

`std::vector<T>` to `PyObject*` conversion logic:
- If `std::vector<T>` is empty - return empty tuple.
- If `T` has a corresponding `Mat` `DataType` than return
  Numpy array instance of the matching `dtype` e.g.
  `std::vector<cv::Rect>` is returned as `np.ndarray` of shape `Nx4` and
  `dtype=int`.
  This branch helps to optimize further evaluations in user code.
- Otherwise - execute the general case:
  Construct a tuple of length N = `std::vector::size` and insert
  elements one by one.

Unnecessary functions were removed and code was rearranged to allow
compiler select the appropriate conversion function specialization.

2 years agoMerge pull request #20635 from alalek:issue_20559
Alexander Alekhin [Tue, 31 Aug 2021 14:42:20 +0000 (14:42 +0000)]
Merge pull request #20635 from alalek:issue_20559

2 years agodnn(ocl): drop CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE check
Alexander Alekhin [Mon, 30 Aug 2021 20:40:14 +0000 (20:40 +0000)]
dnn(ocl): drop CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE check

- it is a hint and it should not block kernel execution

2 years agoMerge pull request #20622 from diablodale:fix20544-nodiscard
Alexander Alekhin [Mon, 30 Aug 2021 18:09:51 +0000 (18:09 +0000)]
Merge pull request #20622 from diablodale:fix20544-nodiscard

2 years agoMerge pull request #20633 from alalek:ocl_dumpValue_handle_null
Alexander Alekhin [Mon, 30 Aug 2021 13:39:44 +0000 (13:39 +0000)]
Merge pull request #20633 from alalek:ocl_dumpValue_handle_null

2 years agocore(ocl): handle NULL in dumpValue() debug call
Alexander Alekhin [Mon, 30 Aug 2021 11:46:14 +0000 (11:46 +0000)]
core(ocl): handle NULL in dumpValue() debug call

- NULL is used for allocation of workgroup local variables

2 years agoMerge pull request #20625 from alalek:fix_msvc_warnings
Alexander Alekhin [Sat, 28 Aug 2021 21:24:02 +0000 (21:24 +0000)]
Merge pull request #20625 from alalek:fix_msvc_warnings

2 years agofix opencv/opencv#20544 nodiscard for msvc/gcc
Dale Phurrough [Fri, 27 Aug 2021 23:12:44 +0000 (01:12 +0200)]
fix opencv/opencv#20544 nodiscard for msvc/gcc

- includes workaround for preprocessor non-compliance
- enable attribute syntax checking in msvc

2 years agobuild: eliminate build warnings
Alexander Alekhin [Sat, 28 Aug 2021 17:11:26 +0000 (17:11 +0000)]
build: eliminate build warnings

2 years agoMerge pull request #20623 from alalek:fix_java_byte
Alexander Alekhin [Sat, 28 Aug 2021 13:23:33 +0000 (13:23 +0000)]
Merge pull request #20623 from alalek:fix_java_byte

2 years agojava(test): avoid deprecation warning
Alexander Alekhin [Sat, 28 Aug 2021 01:28:34 +0000 (01:28 +0000)]
java(test): avoid deprecation warning

- 'new Byte' => 'Byte.valueOf'

2 years agoMerge pull request #20609 from vrabaud:3.4
Alexander Alekhin [Fri, 27 Aug 2021 23:42:24 +0000 (23:42 +0000)]
Merge pull request #20609 from vrabaud:3.4

2 years agoDo not use deprecated ReleaseCleared in protobuf library.
Vincent Rabaud [Thu, 26 Aug 2021 07:46:25 +0000 (09:46 +0200)]
Do not use deprecated ReleaseCleared in protobuf library.

This is to make code work with protobuf arenas for memory
management (ReleaseCleared is incompatible).
The cleaning of the memory is also simpler.

2 years agoMerge pull request #20602 from diablodale:fix20594-refcounts-wiith-exceptions
Alexander Alekhin [Wed, 25 Aug 2021 22:13:43 +0000 (22:13 +0000)]
Merge pull request #20602 from diablodale:fix20594-refcounts-wiith-exceptions

2 years agofix opencv/opencv#20594 - exception handling with refcounts
Dale Phurrough [Tue, 24 Aug 2021 16:56:25 +0000 (18:56 +0200)]
fix opencv/opencv#20594 - exception handling with refcounts

2 years agoadd test case
Dale Phurrough [Tue, 24 Aug 2021 18:06:36 +0000 (20:06 +0200)]
add test case

2 years agoMerge pull request #20586 from alalek:issue_20585
Alexander Alekhin [Sat, 21 Aug 2021 17:22:58 +0000 (17:22 +0000)]
Merge pull request #20586 from alalek:issue_20585

2 years agodnn(ocl): fix top initialization in verifyResult
Alexander Alekhin [Sat, 21 Aug 2021 16:04:13 +0000 (16:04 +0000)]
dnn(ocl): fix top initialization in verifyResult

2 years agoMerge pull request #20581 from alalek:issue_20571
Alexander Alekhin [Fri, 20 Aug 2021 11:36:38 +0000 (11:36 +0000)]
Merge pull request #20581 from alalek:issue_20571

2 years agoMerge pull request #20564 from AleksandrPanov:update_kalman_sample
Alexander Panov [Fri, 20 Aug 2021 10:57:05 +0000 (13:57 +0300)]
Merge pull request #20564 from AleksandrPanov:update_kalman_sample

Update kalman sample

* updated view and comments, fixed dims

* updated view and comments, added statePost

2 years agoMerge pull request #20556 from rogday:onnx_split_sum_fix
Alexander Alekhin [Fri, 20 Aug 2021 08:10:18 +0000 (08:10 +0000)]
Merge pull request #20556 from rogday:onnx_split_sum_fix

3 years agocmake: handle empty CVPY_SUFFIX
Alexander Alekhin [Thu, 19 Aug 2021 20:06:41 +0000 (20:06 +0000)]
cmake: handle empty CVPY_SUFFIX

3 years agoMerge pull request #20386 from vrabaud:3.4
Alexander Alekhin [Thu, 19 Aug 2021 14:54:02 +0000 (14:54 +0000)]
Merge pull request #20386 from vrabaud:3.4

3 years agoUse the one argument version of SetTotalBytesLimit.
Vincent Rabaud [Fri, 9 Jul 2021 22:21:52 +0000 (00:21 +0200)]
Use the one argument version of SetTotalBytesLimit.

The two argument versions has been deprecated, cf
https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream

3 years agofix hasDynamicShapes for batch_size and fix axis selection in Scale layer
Smirnov Egor [Wed, 18 Aug 2021 15:37:35 +0000 (18:37 +0300)]
fix hasDynamicShapes for batch_size and fix axis selection in Scale layer

3 years agofix Split partial sum
Smirnov Egor [Mon, 16 Aug 2021 12:44:54 +0000 (15:44 +0300)]
fix Split partial sum

3 years agoMerge pull request #20506 from JulieBar:lstm_activations
Julia Bareeva [Fri, 13 Aug 2021 12:41:00 +0000 (15:41 +0300)]
Merge pull request #20506 from JulieBar:lstm_activations

* Support activations(Sigmoid, Tanh) for LSTM

* fix warning

3 years agoMerge pull request #20525 from SamFC10:fix-prior-variances
Alexander Alekhin [Fri, 13 Aug 2021 10:06:55 +0000 (10:06 +0000)]
Merge pull request #20525 from SamFC10:fix-prior-variances

3 years agoMerge pull request #20541 from iyadahmed:video_capture_timeout_prop
Iyad Ahmed [Thu, 12 Aug 2021 16:51:02 +0000 (16:51 +0000)]
Merge pull request #20541 from iyadahmed:video_capture_timeout_prop

* VideoCapture timeout set/get

* Common formatting for enum values

* Fix enum values wrongly in videoio.hpp

* Define timeout enum values in public api and align with master

3 years agoMerge pull request #20545 from AleksandrPanov:resize_docummentation
Alexander Alekhin [Thu, 12 Aug 2021 15:13:21 +0000 (15:13 +0000)]
Merge pull request #20545 from AleksandrPanov:resize_docummentation

3 years agoadd note about Python's dsize to doc
AleksandrPanov [Thu, 12 Aug 2021 11:40:40 +0000 (14:40 +0300)]
add note about Python's dsize to doc

3 years agoMerge pull request #20515 from utibenkei:fix_java_ml_testSaveLoad
Alexander Alekhin [Thu, 12 Aug 2021 08:12:48 +0000 (08:12 +0000)]
Merge pull request #20515 from utibenkei:fix_java_ml_testSaveLoad

3 years agoMerge pull request #20533 from AleksandrPanov:minAreaRect_fix_rotatingCalipers
Alexander Alekhin [Wed, 11 Aug 2021 17:56:33 +0000 (17:56 +0000)]
Merge pull request #20533 from AleksandrPanov:minAreaRect_fix_rotatingCalipers

3 years agofix choose minimum angle in rotatingCalipers
AleksandrPanov [Wed, 11 Aug 2021 16:08:52 +0000 (19:08 +0300)]
fix choose minimum angle in rotatingCalipers

3 years agofix testSaveLoad
utibenkei [Sat, 7 Aug 2021 16:08:31 +0000 (01:08 +0900)]
fix testSaveLoad

3 years agoMerge pull request #20466 from rogday:efficientnet_fix_34
Alexander Alekhin [Tue, 10 Aug 2021 22:18:17 +0000 (22:18 +0000)]
Merge pull request #20466 from rogday:efficientnet_fix_34

3 years agoMerge pull request #20500 from AleksandrPanov:findContours_documentation
Alexander Alekhin [Tue, 10 Aug 2021 17:21:32 +0000 (17:21 +0000)]
Merge pull request #20500 from AleksandrPanov:findContours_documentation

3 years agoadd 19769 and 19769_lightweight tests
AleksandrPanov [Tue, 10 Aug 2021 15:53:28 +0000 (18:53 +0300)]
add 19769 and 19769_lightweight tests

3 years agoadd Max layer to TFImporter
Smirnov Egor [Mon, 9 Aug 2021 10:28:33 +0000 (13:28 +0300)]
add Max layer to TFImporter

3 years agofix bug in prior-box variances
SamFC10 [Mon, 9 Aug 2021 06:38:55 +0000 (12:08 +0530)]
fix bug in prior-box variances

3 years agoMerge pull request #20505 from AleksandrPanov:contours_tutorial_documentation
Alexander Alekhin [Fri, 6 Aug 2021 07:09:26 +0000 (07:09 +0000)]
Merge pull request #20505 from AleksandrPanov:contours_tutorial_documentation

3 years agoMerge pull request #20502 from ddacw:3.4
Alexander Alekhin [Fri, 6 Aug 2021 07:06:51 +0000 (07:06 +0000)]
Merge pull request #20502 from ddacw:3.4

3 years agoMerge pull request #20480 from JulieBar:lstm_pytest
Julia Bareeva [Thu, 5 Aug 2021 15:13:17 +0000 (18:13 +0300)]
Merge pull request #20480 from JulieBar:lstm_pytest

Add Python's test for LSTM layer

* Add Python's test for LSTM layer

* Set different test threshold for FP16 target

* rename test to test_input_3d

Co-authored-by: Julie Bareeva <julia.bareeva@xperience.ai>
3 years agoadd links in python and js contours tutorial
AleksandrPanov [Thu, 5 Aug 2021 11:21:34 +0000 (14:21 +0300)]
add links in python and js contours tutorial

3 years agoMerge pull request #20493 from abhi-bhatra:patch-1
Abhinav Sharma [Wed, 4 Aug 2021 17:28:59 +0000 (22:58 +0530)]
Merge pull request #20493 from abhi-bhatra:patch-1

Fix Broken Link

* Update README.md

Fix broken link

* Update Readme.txt

* Update readme.txt

Add missing link

* Update readme.txt

Fix names

3 years agoAvoid adding false UMat/GpuMat declaration
Duong Dac [Wed, 4 Aug 2021 13:17:25 +0000 (15:17 +0200)]
Avoid adding false UMat/GpuMat declaration

3 years agoadd note about hierarchy in python version
AleksandrPanov [Wed, 4 Aug 2021 12:37:20 +0000 (15:37 +0300)]
add note about hierarchy in python version

3 years agoMerge pull request #20487 from AleksandrPanov:traincascade_documentation
Alexander Alekhin [Tue, 3 Aug 2021 12:06:46 +0000 (12:06 +0000)]
Merge pull request #20487 from AleksandrPanov:traincascade_documentation

3 years agoadd note about using version 3.4 to traincascade documentation
AleksandrPanov [Mon, 2 Aug 2021 15:41:53 +0000 (18:41 +0300)]
add note about using version 3.4 to traincascade documentation

3 years agoMerge pull request #20485 from VadimLevin:dev/vlevin/fix-reserved-python-keyword...
Alexander Alekhin [Mon, 2 Aug 2021 08:09:55 +0000 (08:09 +0000)]
Merge pull request #20485 from VadimLevin:dev/vlevin/fix-reserved-python-keyword-arguments

3 years agoMerge pull request #20451 from kumar-mahendra:patch-1
Alexander Alekhin [Sun, 1 Aug 2021 14:22:09 +0000 (14:22 +0000)]
Merge pull request #20451 from kumar-mahendra:patch-1

3 years agofix: convert arguments names that are keywords reserved by Python
Vadim Levin [Sun, 1 Aug 2021 08:59:16 +0000 (11:59 +0300)]
fix: convert arguments names that are keywords reserved by Python

3 years agoClosing brackets missing
Mahendra Kumar [Fri, 23 Jul 2021 11:14:48 +0000 (16:44 +0530)]
Closing brackets missing

In line 94,  closing brackets are added which were missing .

3 years agoMerge pull request #20453 from rogday:onnx_importer_fix
rogday [Wed, 28 Jul 2021 15:06:24 +0000 (18:06 +0300)]
Merge pull request #20453 from rogday:onnx_importer_fix

Split layer dispatch into functions in ONNXImporter

* split layer dispatch into functions

* fixes

* identation and comment fixes

* fix constness

3 years agoMerge pull request #20459 from xerxesb:bugfix/cuda-cmake-typo
Alexander Alekhin [Mon, 26 Jul 2021 09:57:44 +0000 (09:57 +0000)]
Merge pull request #20459 from xerxesb:bugfix/cuda-cmake-typo

3 years agoFixed typo in error message in OpenCVDetectCUDA.cmake
Xerxes Battiwalla [Mon, 26 Jul 2021 04:54:27 +0000 (14:54 +1000)]
Fixed typo in error message in OpenCVDetectCUDA.cmake

There was a minor typo in the FATAL error message when the specified CUDA generation does not match any known generation

3 years agoMerge pull request #20424 from sbajtl:worker-importscript-bugfix
Alexander Alekhin [Sat, 24 Jul 2021 15:28:01 +0000 (15:28 +0000)]
Merge pull request #20424 from sbajtl:worker-importscript-bugfix

3 years agoMerge pull request #20369 from shreyastaware:master
Alexander Alekhin [Sat, 24 Jul 2021 13:41:01 +0000 (13:41 +0000)]
Merge pull request #20369 from shreyastaware:master

3 years agoMerge pull request #20447 from snoyes:patch-1
Alexander Alekhin [Fri, 23 Jul 2021 14:34:57 +0000 (14:34 +0000)]
Merge pull request #20447 from snoyes:patch-1

3 years agoMerge pull request #20450 from JulieBar:lstm_inside
Julia Bareeva [Fri, 23 Jul 2021 14:11:50 +0000 (17:11 +0300)]
Merge pull request #20450 from JulieBar:lstm_inside

Support non-zero hidden state for LSTM

* fully support non-zero hidden state for LSTM

* check dims of hidden state for LSTM

* fix failed test Test_Model.TextRecognition

* add new tests for LSTM w/ non-zero hidden params

Co-authored-by: Julie Bareeva <julia.bareeva@xperience.ai>
3 years agominor grammar edits
Scott Noyes [Thu, 22 Jul 2021 19:58:20 +0000 (14:58 -0500)]
minor grammar edits

3 years agoUpdate py_canny.markdown
Shreyas Taware [Wed, 7 Jul 2021 09:10:08 +0000 (14:40 +0530)]
Update py_canny.markdown

Fixed a word that was previously written as third argument but it is instead the fourth argument of cv.Canny() function

3 years agoMerge pull request #20429 from rogday:tf_importer_asym_pads
Alexander Alekhin [Thu, 22 Jul 2021 16:44:47 +0000 (16:44 +0000)]
Merge pull request #20429 from rogday:tf_importer_asym_pads

3 years agoimplement asymmetric padding for conv2d, max_pool and conv2d_backprop_input
Smirnov Egor [Mon, 19 Jul 2021 15:24:15 +0000 (18:24 +0300)]
implement asymmetric padding for conv2d, max_pool and conv2d_backprop_input

3 years agoMerge pull request #20437 from pytianxxiao:fix#20430
Alexander Alekhin [Wed, 21 Jul 2021 09:47:10 +0000 (09:47 +0000)]
Merge pull request #20437 from pytianxxiao:fix#20430

3 years agofix: ocv_target_link_libraries could not handle the keyword rightly #20430
Xiaoxiao Tian [Wed, 21 Jul 2021 05:32:50 +0000 (13:32 +0800)]
fix: ocv_target_link_libraries could not handle the keyword rightly #20430

3 years agoBugfix on import script with web worker.
Saša Bajtl [Sun, 18 Jul 2021 08:12:39 +0000 (10:12 +0200)]
Bugfix on import script with web worker.

3 years agoMerge pull request #20394 from SamFC10:conv-asymmetric-pads
Alexander Alekhin [Fri, 16 Jul 2021 10:33:42 +0000 (10:33 +0000)]
Merge pull request #20394 from SamFC10:conv-asymmetric-pads

3 years agoMerge pull request #20200 from rmeertens:update_grabcut
Alexander Alekhin [Fri, 16 Jul 2021 10:19:25 +0000 (10:19 +0000)]
Merge pull request #20200 from rmeertens:update_grabcut

3 years agoFix convolution asymmetric padding bug in onnx importer
SamFC10 [Fri, 16 Jul 2021 04:09:41 +0000 (09:39 +0530)]
Fix convolution asymmetric padding bug in onnx importer

3 years agoMerge pull request #20410 from alalek:fix_dnn_dldt_output_layout
Alexander Alekhin [Thu, 15 Jul 2021 22:43:42 +0000 (22:43 +0000)]
Merge pull request #20410 from alalek:fix_dnn_dldt_output_layout

3 years agodnn(ie): fix handling of 1D and non-32F outputs of InferenceEngine
Alexander Alekhin [Wed, 14 Jul 2021 23:31:41 +0000 (23:31 +0000)]
dnn(ie): fix handling of 1D and non-32F outputs of InferenceEngine

3 years agodnn(test): add extra IR models, more checks in IE testing code
Alexander Alekhin [Sat, 10 Jul 2021 13:06:33 +0000 (13:06 +0000)]
dnn(test): add extra IR models, more checks in IE testing code

3 years agoMerge pull request #20420 from berak:python_fix_trackbar_warning
Alexander Alekhin [Thu, 15 Jul 2021 20:06:22 +0000 (20:06 +0000)]
Merge pull request #20420 from berak:python_fix_trackbar_warning

3 years agopython: fix trackbar warning
berak [Thu, 15 Jul 2021 15:02:23 +0000 (17:02 +0200)]
python: fix trackbar warning

3 years agodnn(test): backport test_ie_models.cpp from 4.5.3
Alexander Alekhin [Fri, 9 Jul 2021 16:22:13 +0000 (16:22 +0000)]
dnn(test): backport test_ie_models.cpp from 4.5.3

3 years agoUpdated grabcut example to show the background in a transparant way
Roland Meertens [Thu, 3 Jun 2021 18:59:22 +0000 (20:59 +0200)]
Updated grabcut example to show the background in a transparant way

3 years agoMerge pull request #20399 from pablorcum:3.4
Pablo Romero [Tue, 13 Jul 2021 19:40:15 +0000 (21:40 +0200)]
Merge pull request #20399 from pablorcum:3.4

Improves support for Unix non-Linux systems, including QNX

* Fixes #20395. Improves support for Unix non-Linux systems. Focus on QNX Neutrino.

Signed-off-by: promero <promero@mathworks.com>
* Update system.cpp

3 years agoMerge pull request #20397 from alalek:fix_winpack_dldt_stale_sysroot
Alexander Alekhin [Mon, 12 Jul 2021 21:14:22 +0000 (21:14 +0000)]
Merge pull request #20397 from alalek:fix_winpack_dldt_stale_sysroot

3 years agobuild(winpack_dldt): avoid stale sysroot contents
Alexander Alekhin [Mon, 12 Jul 2021 19:32:11 +0000 (19:32 +0000)]
build(winpack_dldt): avoid stale sysroot contents

3 years agoMerge pull request #20374 from cesarpgouveia:bugfix/fix_load_onnxModel_debug
César Gouveia [Fri, 9 Jul 2021 18:21:56 +0000 (19:21 +0100)]
Merge pull request #20374 from cesarpgouveia:bugfix/fix_load_onnxModel_debug

* Fix bug while loading onnx model in debug

* dnn: fix other .at using

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
3 years agoMerge pull request #20381 from berak:dnn_samples_fix_colorization_links
Alexander Alekhin [Fri, 9 Jul 2021 18:15:10 +0000 (18:15 +0000)]
Merge pull request #20381 from berak:dnn_samples_fix_colorization_links

3 years agodnn: update links for the colorization samples
berak [Fri, 9 Jul 2021 11:21:44 +0000 (13:21 +0200)]
dnn: update links for the colorization samples

3 years agoMerge pull request #20368 from mightbxg:bugfix_imshowqt
Alexander Alekhin [Thu, 8 Jul 2021 20:54:09 +0000 (20:54 +0000)]
Merge pull request #20368 from mightbxg:bugfix_imshowqt

3 years agoMerge pull request #20373 from kikaxa:mjpeg-VideoInputStream-alignment-fix
Alexander Alekhin [Wed, 7 Jul 2021 18:21:57 +0000 (18:21 +0000)]
Merge pull request #20373 from kikaxa:mjpeg-VideoInputStream-alignment-fix

3 years agofix videoio/src/container_avi.cpp VideoInputStream alignment
kikaxa [Wed, 7 Jul 2021 15:31:53 +0000 (18:31 +0300)]
fix videoio/src/container_avi.cpp VideoInputStream alignment

3 years agofix scale problem in DefaultViewPort::controlImagePosition()
Xinguang Bian [Wed, 7 Jul 2021 04:35:11 +0000 (12:35 +0800)]
fix scale problem in DefaultViewPort::controlImagePosition()

3 years agoMerge tag '3.4.15'
Alexander Alekhin [Sun, 4 Jul 2021 21:31:56 +0000 (21:31 +0000)]
Merge tag '3.4.15'

3 years agorelease: OpenCV 3.4.15
Alexander Alekhin [Sun, 4 Jul 2021 21:10:13 +0000 (21:10 +0000)]
release: OpenCV 3.4.15

3 years agoMerge pull request #20350 from alalek:issue_20285
Alexander Alekhin [Sun, 4 Jul 2021 21:07:02 +0000 (21:07 +0000)]
Merge pull request #20350 from alalek:issue_20285

3 years agoMerge pull request #20354 from alalek:issue_20353
Alexander Alekhin [Sun, 4 Jul 2021 18:41:34 +0000 (18:41 +0000)]
Merge pull request #20354 from alalek:issue_20353

3 years agocmake: update Halide detection
Alexander Alekhin [Sun, 4 Jul 2021 10:07:34 +0000 (13:07 +0300)]
cmake: update Halide detection

3 years agocmake: exclude -pthread from Emscripten default build
Alexander Alekhin [Sat, 3 Jul 2021 10:57:18 +0000 (10:57 +0000)]
cmake: exclude -pthread from Emscripten default build

3 years agoMerge pull request #20346 from alalek:backport_20026
Alexander Alekhin [Sat, 3 Jul 2021 00:27:54 +0000 (00:27 +0000)]
Merge pull request #20346 from alalek:backport_20026