Alexander Alekhin [Wed, 28 Oct 2020 14:41:08 +0000 (14:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 28 Oct 2020 14:40:47 +0000 (14:40 +0000)]
Merge pull request #18672 from alalek:cmake_3rdparty_exclude_from_all
Alexander Alekhin [Wed, 28 Oct 2020 14:02:08 +0000 (14:02 +0000)]
Merge pull request #18685 from APrigarina:fix_curved_qrcodes
Alexander Alekhin [Tue, 27 Oct 2020 19:00:25 +0000 (19:00 +0000)]
cmake(3rdparty): use EXCLUDE_FROM_ALL
Alexander Alekhin [Wed, 28 Oct 2020 11:40:49 +0000 (11:40 +0000)]
Merge pull request #18663 from alalek:core_cleanup_inline_code_4.x
Alexander Alekhin [Wed, 28 Oct 2020 10:38:55 +0000 (10:38 +0000)]
Merge pull request #18671 from rgarnov:rg/rmat_and_s11n_fixes
APrigarina [Wed, 28 Oct 2020 09:48:42 +0000 (12:48 +0300)]
fix curved qrcodes decoding
Alexander Alekhin [Tue, 27 Oct 2020 17:49:21 +0000 (17:49 +0000)]
Merge pull request #18664 from ackbar345:mikkel/fix-manual-page-size
Mikkel Green [Mon, 26 Oct 2020 23:04:55 +0000 (16:04 -0700)]
Bugfix: Manual page sizes now overwrite the default page size if they are both specified. Remove redudant .upper() call, 1 to 1 key matching enforced
by argparse choices.
Alexander Alekhin [Mon, 26 Oct 2020 22:58:30 +0000 (22:58 +0000)]
core: move inline code from mat.inl.hpp (OpenCV 4.x additions)
base commit:
aac7c5465ba6ccfe0dc665ab0bae87f765e616ba
Alexander Alekhin [Mon, 26 Oct 2020 20:07:47 +0000 (20:07 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Anatoliy Talamanov [Mon, 26 Oct 2020 19:55:43 +0000 (22:55 +0300)]
Merge pull request #18600 from TolyaTalamanov:at/implement-render-using-stateful
[G-API] Implement render using stateful kernel
* Implement render using stateful kernel
* Move freetype to backends folder
* Fix freetype compilation
* Fix freetype smoke test
* Fix comments
* Refactoring
Anatoliy Talamanov [Mon, 26 Oct 2020 19:02:03 +0000 (22:02 +0300)]
Merge pull request #18491 from TolyaTalamanov:at/wrap-inference
[G-API] Wrap cv::gapi::infer<Generic> into python
* Introduce generic infer
* Move Generic to infer.hpp
* Removew num_outs
* Fix windows warnings
* Fix comments to review
* Fix doxygen
* Add comment
* Fix comments to review
* Wrap inference to python
* Add default ctor to Params
* Add test
* Fix clang build
* Implement GInferInputs/GInferOutputs as Pimpl
* Add checkIEtarget to infer test
* Fix path
* Supress warning
* Use getAvailableDevices insted of checkIETarget
* Move PyParams to bindings_ie
* Add namespace
* Update CMakeLists.txt
Ruslan Garnov [Sun, 25 Oct 2020 23:07:03 +0000 (02:07 +0300)]
Minor s11n and RMat improvements:
- Changed descr_of(RMat) to use canDescribeHelper to correctly handle planar case
- Added export of createMat
- Added setting of Storage::INPUT and Storage::OUTPUT in deserialization routine of GComputation
Quentin Chateau [Sun, 25 Oct 2020 15:58:27 +0000 (16:58 +0100)]
Merge pull request #18646 from qchateau:wave-auto
* stitching: add WAVE_CORRECT_AUTO
* stitching: use CV_EXPORTS
Alexander Alekhin [Sat, 24 Oct 2020 17:06:08 +0000 (17:06 +0000)]
Merge pull request #18640 from alalek:core_cleanup_inline_code
ann [Fri, 23 Oct 2020 18:42:45 +0000 (21:42 +0300)]
Merge pull request #18003 from APrigarina:curved_qrcodes_decoding
Detection and decoding of curved QR-codes
* temp changes for curved qrcodes
* added api for curved qr code decoding
* fixed prototypes
* refactored curved qr code decoding
* refactored curved qr code decoding 2nd part
* refactored curved qr code decoding 3rd part
* refactored curved qr code decoding 4th part
* added tests for curved qr code decoding
* refactored curved qr code decoding 5th part
Alexander Alekhin [Fri, 23 Oct 2020 16:47:37 +0000 (16:47 +0000)]
Merge pull request #18633 from laelath:master
Giles Payne [Fri, 23 Oct 2020 11:19:36 +0000 (20:19 +0900)]
Merge pull request #18637 from komakai:build-for-distribution
Add support for Swift version independence
* Build for distribution (Swift version independence) when new Xcode build system is available
* Add module map and set "Defines Modules" flag
Justin Frank [Wed, 21 Oct 2020 00:31:34 +0000 (17:31 -0700)]
Fix TypeError when building for WebAssembly with Python 3
Alexander Alekhin [Thu, 22 Oct 2020 17:43:23 +0000 (17:43 +0000)]
Merge pull request #18622 from TolyaTalamanov:at/fix-namespace
Alexander Alekhin [Thu, 22 Oct 2020 12:25:55 +0000 (12:25 +0000)]
Merge pull request #18641 from rtimpe:fix_cuda_stubs
Quentin Chateau [Thu, 22 Oct 2020 12:24:58 +0000 (14:24 +0200)]
Merge pull request #18624 from qchateau:similarity-mask
* support similarity masks
* add test for similarity threshold
* short license in test
* use UMat in buildSimilarityMask
* fix win32 warnings
* fix test indentation
* fix umat/mat sync
* no in-place argument for erode/dilate
Alexander Alekhin [Thu, 22 Oct 2020 12:22:26 +0000 (12:22 +0000)]
Merge pull request #18607 from zteffi:warp-point-backward
Alexander Alekhin [Thu, 22 Oct 2020 12:21:54 +0000 (12:21 +0000)]
Merge pull request #18476 from dmatveev:dm/gapi_text_detection
Alexander Alekhin [Wed, 21 Oct 2020 22:47:56 +0000 (22:47 +0000)]
core: move inline code from mat.inl.hpp
Rob Timpe [Wed, 21 Oct 2020 22:51:46 +0000 (15:51 -0700)]
Fix errors when building with cuda stubs
Fixes two errors when building with the options WITH_CUDA=ON and BUILD_CUDA_STUBS=ON on a machine without CUDA.
In the cudaarithm module, make sure cuda_runtime.h only gets included when CUDA is installed.
In the stitching module, don't assume that cuda is present just because cudaarithm and cudawarping are present (as is the case when building with the above options).
Alexander Alekhin [Wed, 21 Oct 2020 15:55:23 +0000 (15:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Martin Štefaňák [Thu, 15 Oct 2020 22:28:15 +0000 (00:28 +0200)]
stitching: add warpPointBackward to warpers
test by projecting and reprojecting back random points
Dmitry Matveev [Wed, 30 Sep 2020 21:18:04 +0000 (00:18 +0300)]
G-API: Introduced a Text Detection sample
This sample models the Text Detection demo from OMZ:
https://github.com/openvinotoolkit/open_model_zoo/tree/2020.4/demos/text_detection_demo
Also: renamed cv::gapi::size() to cv::gapi::streaming::size()
Anna Khakimova [Wed, 21 Oct 2020 10:52:03 +0000 (13:52 +0300)]
Merge pull request #18338 from anna-khakimova:ak/opt_arithm_kernel
Univ Intrinsics implementation of Add, Sub, Absdiff kernels
* Add, sub, absdiff kernels optimization
* avoid unused conditions
* add conditions for tail processing
Alexey Smirnov [Tue, 20 Oct 2020 20:58:54 +0000 (23:58 +0300)]
Merge pull request #18584 from smirnov-alexey:as/rmat_s11n
[G-API]: Introduce RMat serialization API
* Introduce RMat serialization API
* Fix RunArgs deserialization
* Address review comments
* Export operators for GRunArg serialization
* Fix warning and add handling for RMat in bind()
* Update CMakeLists.txt
* G-API: RMat S11N -- probably fix the Windows warning
Alexander Alekhin [Tue, 20 Oct 2020 20:03:49 +0000 (20:03 +0000)]
Merge pull request #18628 from innerlee:patch-1
lizz [Tue, 20 Oct 2020 04:09:03 +0000 (12:09 +0800)]
Typo in docstring of distanceTransform
Alexander Alekhin [Mon, 19 Oct 2020 22:53:05 +0000 (22:53 +0000)]
Merge pull request #18588 from damonmo:fix-issue-18553
Alexander Alekhin [Mon, 19 Oct 2020 22:42:48 +0000 (22:42 +0000)]
Merge pull request #18614 from ZhiyuanChen:patch-1
Zhiyuan Chen [Sun, 18 Oct 2020 14:33:45 +0000 (22:33 +0800)]
fixes #18613
Nikolai [Mon, 19 Oct 2020 17:39:19 +0000 (20:39 +0300)]
Merge pull request #18426 from Varvrar:add-HEVC-codec-iOS-Mac
* add HEVC(H.265) codec to iOS,Mac VideoWriter
* Update cap_avfoundation_mac.mm
add CV_FOURCC('h','v','c','1') for HEVC codec
* Update cap_avfoundation.mm
add CV_FOURCC('h','v','c','1') for HEVC codec
* feat: add availability check for HEVC codec on iOS and OS X
Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>
Alexander Alekhin [Mon, 19 Oct 2020 17:16:11 +0000 (17:16 +0000)]
Merge pull request #18621 from dbudniko:gapi_ww43_2020_KW_fixes
Daniel Motilla [Mon, 19 Oct 2020 12:35:03 +0000 (14:35 +0200)]
Enable imshow to take GpuMat inputs in Python
Anatoliy Talamanov [Mon, 19 Oct 2020 11:19:17 +0000 (14:19 +0300)]
Fix namespace for OCVCallHelper
Dmitry Budnikov [Mon, 19 Oct 2020 10:46:23 +0000 (13:46 +0300)]
KW fixes
masa-iwm [Sun, 18 Oct 2020 21:22:06 +0000 (06:22 +0900)]
Merge pull request #18593 from masa-iwm:master
Add support thread-local directx (OpenCL interop) initialization
* support thread-local directx (OpenCL interop) initialization
* reflect reviews
* Remove verbose function prototype declarations
* Countermeasures for VC warnings. (declaration of 'platform' hides class member)
* core(directx): remove internal stuff from public headers
Kun Liang [Sun, 18 Oct 2020 20:30:36 +0000 (04:30 +0800)]
Merge pull request #18068 from lionkunonly:gsoc_2020_simd
[GSoC] OpenCV.js: WASM SIMD optimization 2.0
* gsoc_2020_simd Add perf test for filter2d
* add perf test for kernel scharr and kernel gaussianBlur
* add perf test for blur, medianBlur, erode, dilate
* fix the errors for the opencv PR robot
fix the trailing whitespace.
* add perf tests for kernel remap, warpAffine, warpPersepective, pyrDown
* fix a bug in modules/js/perf/perf_imgproc/perf_remap.js
* add function smoothBorder in helpfun.js and remove replicated function in perf test of warpAffine and warpPrespective
* fix the trailing white space issues
* add OpenCV.js loader
* Implement the Loader with help of WebAssembly Feature Detection, remove trailing whitespaces
* modify the explantion for loader in js_setup.markdown and fix bug in loader.js
Alexander Alekhin [Sun, 18 Oct 2020 19:28:45 +0000 (19:28 +0000)]
Merge pull request #18598 from aleromar:Issue18595_UsacParams_PythonBinding
Alexander Alekhin [Sat, 17 Oct 2020 16:57:04 +0000 (16:57 +0000)]
Merge pull request #18605 from komakai:fix-swift-binding
Giles Payne [Sat, 17 Oct 2020 05:31:24 +0000 (14:31 +0900)]
Fix handling of properties with enum type
Alexander Alekhin [Fri, 16 Oct 2020 20:22:58 +0000 (20:22 +0000)]
Merge pull request #18602 from alalek:issue_18597
Alexander Alekhin [Fri, 16 Oct 2020 19:47:03 +0000 (19:47 +0000)]
Merge pull request #18590 from krush11:master
Alexander Alekhin [Fri, 16 Oct 2020 19:46:24 +0000 (19:46 +0000)]
Merge pull request #18533 from paroj:imwritemulti
Alexander Alekhin [Fri, 16 Oct 2020 15:35:51 +0000 (15:35 +0000)]
core: fix __clang_major__ typo regression
arodrigu [Fri, 16 Oct 2020 12:41:41 +0000 (14:41 +0200)]
Fix: UsacParams Python bindings
Pavel Rojtberg [Wed, 7 Oct 2020 10:19:17 +0000 (12:19 +0200)]
imwrite: multi-image overload for bindings
Krushnal Patel [Wed, 14 Oct 2020 17:52:46 +0000 (23:22 +0530)]
Update demosaicing.cpp
Alexander Alekhin [Thu, 15 Oct 2020 18:43:46 +0000 (18:43 +0000)]
Merge pull request #18589 from alalek:issue_13328
Anatoliy Talamanov [Thu, 15 Oct 2020 13:59:02 +0000 (16:59 +0300)]
Merge pull request #18542 from TolyaTalamanov:at/import-network
[G-API] Support ImportNetwork for cv::gapi::infer
* wip
* Refactoring
* Fix comments to review
* Fix warning
Co-authored-by: Ruslan Garnov <ruslan.garnov@intel.com>
Anatoliy Talamanov [Wed, 14 Oct 2020 22:21:09 +0000 (01:21 +0300)]
Merge pull request #18493 from TolyaTalamanov:at/wrap-streaming
[G-API Wrap streaming
* Wrap streaming
* Fix build
* Add comments
* Remove comment
* Fix comments to review
* Add test for python pull overload
Alexander Alekhin [Wed, 14 Oct 2020 21:13:54 +0000 (21:13 +0000)]
Merge pull request #18582 from weltonrodrigo:remap_inter_doc
Alexander Alekhin [Wed, 14 Oct 2020 18:06:59 +0000 (18:06 +0000)]
Merge pull request #18583 from weltonrodrigo:remap_inter_doc_4
Alexander Alekhin [Wed, 14 Oct 2020 16:59:44 +0000 (16:59 +0000)]
Merge pull request #18566 from mtfrctl:mat-objc-swift-data-pointer
mtfrctl [Wed, 14 Oct 2020 16:58:06 +0000 (01:58 +0900)]
Merge pull request #18547 from mtfrctl:objc-conversions-macosx
Mat conversions for macOS/AppKit
* Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions. Add macosx_conversions.mm
* Add macosx.h
* Add Mat+Conversions.h and Mat+Conversions.mm
* Delete duplicated declaration from apple_conversion.mm
* Use short license header
* Add compile guard
* Delete unused imports
* Move precomp.hpp import from header to implementation
* Add macosx.h to skip headers
* Fix compile guard condition
* Use short license header
* Remove commented out unused code
Anna Khakimova [Wed, 14 Oct 2020 16:51:35 +0000 (19:51 +0300)]
Merge pull request #18516 from anna-khakimova:ak/bgr2rgb
GAPI: Addition new Color conversion kernels to CPU backend.
* Add BGR2RGB kernel to CPU backend
* Add BGR2I420 and RGB2I420 kernels to CPU backend
* Add I4202BGR and I4202RGB kernels to CPU backend
Welton Rodrigo Torres Nascimento [Tue, 13 Oct 2020 14:07:11 +0000 (11:07 -0300)]
Doc update. INTER_LINEAR_EXACT unsupported in remap
Alexander Alekhin [Wed, 14 Oct 2020 10:17:16 +0000 (10:17 +0000)]
Merge pull request #18559 from maxint:fix-rang-loop-construct-warnings
Alexander Alekhin [Tue, 13 Oct 2020 20:28:09 +0000 (20:28 +0000)]
Merge pull request #18581 from alalek:winpack_dldt_videoio_plugins
Welton Rodrigo Torres Nascimento [Tue, 13 Oct 2020 14:51:23 +0000 (11:51 -0300)]
Doc: INTER_LINEAR_EXACT unsupported in remap
Update documentation to reflect INTER_LINEAR_EXACT being
unsupported in remap
Alexander Alekhin [Tue, 13 Oct 2020 13:41:07 +0000 (13:41 +0000)]
build: winpack_dldt with videoio plugins
Alexander Alekhin [Tue, 13 Oct 2020 10:02:39 +0000 (10:02 +0000)]
Merge pull request #18568 from catree:fix_deepgreen_colormap_fig
Alexander Alekhin [Sun, 11 Oct 2020 21:29:42 +0000 (21:29 +0000)]
Merge tag '4.5.0'
Alexander Alekhin [Sun, 11 Oct 2020 21:26:07 +0000 (21:26 +0000)]
release: OpenCV 4.5.0
Alexander Alekhin [Sun, 11 Oct 2020 17:19:22 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
catree [Sun, 11 Oct 2020 15:18:05 +0000 (17:18 +0200)]
Move colorscale_deepgreen.jpg to the correct folder.
mtfrctl [Sun, 11 Oct 2020 10:16:03 +0000 (19:16 +0900)]
Add data pointer bridge method to Mat for Objective-C/Swift
Alexander Alekhin [Sun, 11 Oct 2020 08:08:20 +0000 (08:08 +0000)]
Merge pull request #18564 from alalek:dnn_test_openvino_4.x
Alexander Alekhin [Sat, 10 Oct 2020 21:34:15 +0000 (21:34 +0000)]
dnn(test): update tests for OpenVINO 2021.1 (OpenCV 4.x)
Alexander Alekhin [Sat, 10 Oct 2020 20:18:09 +0000 (20:18 +0000)]
Merge tag '3.4.12'
Alexander Alekhin [Sat, 10 Oct 2020 20:14:29 +0000 (20:14 +0000)]
release: OpenCV 3.4.12
Alexander Alekhin [Sat, 10 Oct 2020 20:02:03 +0000 (20:02 +0000)]
Merge pull request #18557 from alalek:cuda_cmake_fix_auto
maxint [Sat, 10 Oct 2020 07:13:23 +0000 (07:13 +0000)]
Fix warnings: "-Wrange-loop-construct" in gapi
Alexander Alekhin [Fri, 9 Oct 2020 22:00:02 +0000 (22:00 +0000)]
cmake: fix typo in CUDA_GENERATION=Auto cache
Alexander Alekhin [Fri, 9 Oct 2020 20:08:00 +0000 (20:08 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 9 Oct 2020 19:54:17 +0000 (19:54 +0000)]
Merge pull request #18554 from alalek:issue_17945
Alexander Alekhin [Fri, 9 Oct 2020 16:33:48 +0000 (16:33 +0000)]
dnn(opencl): bypass unsupported fusion cases 2
Alexander Alekhin [Fri, 9 Oct 2020 16:08:12 +0000 (16:08 +0000)]
Merge pull request #18551 from alalek:issue_17964
Alexander Alekhin [Fri, 9 Oct 2020 11:57:49 +0000 (11:57 +0000)]
dnn(opencl): bypass unsupported fusion cases
Anatoliy Talamanov [Thu, 8 Oct 2020 22:12:25 +0000 (01:12 +0300)]
Merge pull request #18419 from TolyaTalamanov:at/generic-inference
[G-API] Introduce generic version for cv::gapi::infer
* Introduce generic infer
* Move Generic to infer.hpp
* Removew num_outs
* Fix windows warnings
* Fix comments to review
* Fix doxygen
* Add comment
* Fix comments to review
* standoalone ifdef in ginfer.cpp
* Fix test
Alexander Alekhin [Thu, 8 Oct 2020 21:39:48 +0000 (21:39 +0000)]
Merge pull request #18545 from alalek:enable_tests_17953
Alexander Alekhin [Thu, 8 Oct 2020 20:27:03 +0000 (20:27 +0000)]
dnn(test): enable tests from issue 17953
Alexander Alekhin [Thu, 8 Oct 2020 15:32:03 +0000 (15:32 +0000)]
Merge pull request #18534 from alalek:build_opencv_winpack_dldt_2021.1.0
Alexander Alekhin [Thu, 8 Oct 2020 15:27:50 +0000 (15:27 +0000)]
Merge pull request #18527 from alalek:dnn_test_openvino
Alexander Alekhin [Thu, 8 Oct 2020 15:22:40 +0000 (15:22 +0000)]
Merge pull request #18539 from mshabunin:fix-doc-warnings
Alexander Alekhin [Tue, 6 Oct 2020 23:40:27 +0000 (23:40 +0000)]
dnn(test): update tests for OpenVINO 2021.1
Maksim Shabunin [Thu, 8 Oct 2020 08:50:07 +0000 (11:50 +0300)]
Doc: fixed warnings when CUDA modules are missing
Anastasiya(Asya) Pronina [Wed, 7 Oct 2020 21:48:49 +0000 (00:48 +0300)]
Merge pull request #18496 from AsyaPronina:comp_args_serialization
Serialization && deserialization for compile arguments
* Initial stub
* Add test on serialization of a custom type
* Namespaces rework
* Fix isSupported in test struct
* Fix clang lookup issue
* Initial implementation
* Drop the isSupported flag
* Initial implementation
* Removed internal header inclusion
* Switched to public API
* Implemented serialization
* Adding desirialize: WIP
* Fixed merge errors
* Implemented
* Final polishing
* Addressed review comments and added debug throw
* Added FluidROI test
* Polishing
* Polishing
* Polishing
* Polishing
* Polishing
* Updated CMakeLists.txt
* Fixed comments
* Addressed review comments
* Removed decay from deserialize_arg
* Addressed review comments
* Removed extra inclusion
* Fixed Win64 warning
* Update gcommon.hpp
* Update serialization.cpp
* Update gcommon.hpp
* gapi: drop GAPI_EXPORTS_W_SIMPLE from GCompileArg
Co-authored-by: Smirnov Alexey <alexey.smirnov@intel.com>
Co-authored-by: AsyaPronina <155jj@mail.ru>
Alexander Alekhin [Wed, 7 Oct 2020 21:35:57 +0000 (21:35 +0000)]
Merge pull request #18536 from alalek:backport_doxygen_style_18195
Maksim Shabunin [Wed, 7 Oct 2020 21:35:06 +0000 (00:35 +0300)]
Merge pull request #18195 from mshabunin:linux-tutorial
Installation tutorials rework
* Doc: general installation, config reference, linux installation
* Doc: addressed review comments
* Minor fixes
Anatoliy Talamanov [Wed, 7 Oct 2020 20:38:59 +0000 (23:38 +0300)]
Merge pull request #18512 from TolyaTalamanov:at/fix-untyped-np-array-for-gapi-python
[G-API] Numpy array with int64 failed in cv.gin
* Fix bug with numpy array precision in G-API python
* Fix comments to review
Alexander Alekhin [Wed, 7 Oct 2020 20:16:40 +0000 (20:16 +0000)]
doxygen: backport style changes
Alexander Alekhin [Mon, 5 Oct 2020 21:12:58 +0000 (00:12 +0300)]
build: winpack_dldt with dldt 2021.1.0
Alexander Alekhin [Wed, 7 Oct 2020 09:09:37 +0000 (09:09 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
projects / platform / upstream / opencv.git / log