Alexander Alekhin [Tue, 16 Feb 2021 16:05:09 +0000 (16:05 +0000)]
Merge pull request #19543 from alalek:hotfix_19439
Alexander Alekhin [Tue, 16 Feb 2021 12:32:58 +0000 (12:32 +0000)]
imgcodecs(test): don't include png.h
Dan Ben-Yosef [Mon, 15 Feb 2021 19:58:37 +0000 (21:58 +0200)]
Merge pull request #19525 from danbey:Fix-cppcheck-error-in-carotete-lib
* Reduce if statement as it has the same expression on both sides of '&&'
If statement has the same expression on both sides so this can be reduce
Signed-off-by: Dan Ben Yosef <danbey@gmail.com>
* The if statement is to check width and height
Alexander Alekhin [Mon, 15 Feb 2021 15:33:54 +0000 (15:33 +0000)]
Merge pull request #19532 from amirtu:OCV-166_getDefaultName_overload
Alexander Alekhin [Mon, 15 Feb 2021 15:15:27 +0000 (15:15 +0000)]
Merge pull request #19519 from alalek:issue_19485
amir.tulegenov [Mon, 15 Feb 2021 09:19:23 +0000 (15:19 +0600)]
fix getDefaultName()
Zhuo Zhang [Sun, 14 Feb 2021 18:38:53 +0000 (02:38 +0800)]
Merge pull request #19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19
* fix find zlib.so instead of zlib.a when NDK >= 19
On Android platform, `libopencv_imgcodecs.a` is built, expected to
depend on `libz.so`. However, since Android NDK r19, NDK's `libz.a`
is found instead of `libz.so`, leading to link error
(not found libz.a) on machines without same NDK version & direcotry.
Since Android NDK-r19, toolchain pieces are installed to
`$NDK/toolchains/llvm/prebuilt/<host-tag>/...`, including `libz.so`.
Also installed to old paths (`<NDK>/platforms` and `<NDK>/sysroot`)
in NDK r19, r20, r21, but since NDK 22, old paths are removed.
- https://github.com/android/ndk/wiki/Changelog-r19
- https://github.com/android/ndk/wiki/Changelog-r22
With this commit, `libz.so` can be correctly found in NDK<19 and NDK>=19.
`ZLIB_LIBRARIES` is also simplified as `z`, by appending match (regex)
patterns for new toolchain installation directory's libz.so's paths.
* simplify libz.so match pattern for abbreviation
Zhuo Zhang [Sun, 14 Feb 2021 18:37:11 +0000 (02:37 +0800)]
Merge pull request #19521 from zchrissirhcz:3.4-fix-core-module-android-arm64-build
* fix core module android arm64 build
* fix core module android build when neon is off
When building for Android ARM platform, cmake with
`-D CV_DISABLE_OPTIMIZATION=ON`, the expected behavior is
not using ARM NEON, using naive computation instead.
This commit fix the un-expected compile error for neon intrinsincs.
Alexander Alekhin [Sat, 13 Feb 2021 00:35:18 +0000 (00:35 +0000)]
cmake: fix add_apple_compiler_options() calls and OBJCXX handling
Alexander Alekhin [Sat, 13 Feb 2021 18:18:11 +0000 (18:18 +0000)]
Merge pull request #19520 from WeiChungChang:refine
Qoo [Sat, 13 Feb 2021 00:12:05 +0000 (19:12 -0500)]
refine
Alexander Alekhin [Fri, 12 Feb 2021 20:28:52 +0000 (20:28 +0000)]
Merge pull request #19515 from zchrissirhcz:3.4-fix-mislinked-zlib-in-vcpkg-by-adjust-link-order
Zhuo Zhang [Fri, 12 Feb 2021 14:19:35 +0000 (22:19 +0800)]
fix link order: put zlib after png/tiff/openexr
Previous link dependency: imgcodecs --> zlib --> libpng
this can generate imgcodecs shared lib, until Visual Studio integrated
with vcpkg, which will additionally specify LIBPATH, pointing to vcpkg
installed zlib (if any), which links the wrong zlib.
Fixed link dependency: imgcodecs --> libpng --> zlib
in this fixed case, symbols in zlib referenced in libpng will be found
in the build-from-source static zlib, instead of the vcpkg one.
related discussion:
- https://github.com/microsoft/vcpkg/issues/16165
- https://github.com/opencv/opencv/issues/17051
- https://github.com/opencv/opencv/issues/10576
MSVC linking order reference pages:
- https://docs.microsoft.com/en-us/cpp/build/reference/link-input-files?view=msvc-160
for link order
- https://docs.microsoft.com/en-us/cpp/build/reference/linking?view=msvc-160
LIB environment variable, for library file searching
- https://docs.microsoft.com/en-us/cpp/build/reference/libpath-additional-libpath?view=msvc-160
LIBPATH option, for library file searching
Francesco Petrogalli [Thu, 11 Feb 2021 13:24:09 +0000 (13:24 +0000)]
Merge pull request #19486 from fpetrogalli:dotprod_fast-3.4
* [hal][neon] Optimize the v_dotprod_fast intrinsics for aarch64.
On Armv8 in AArch64 execution mode, we can skip the sequence
v<op>_<ty>(vget_high_<ty>(x), vget_high_<ty>(y))
in favour of
v<op>_high_<ty>(x, y)
This has better changes for recent compilers to use less data movement
operations and better register allocation. See for example:
https://godbolt.org/z/bPq7vd
* [hal][neon] Fix build failure on armv7.
* [hal][neon] Address review comments in PR.
PR: https://github.com/opencv/opencv/pull/19486
* [hal][neon] Define macro to check for the AArch64 execution state of Armv8.
* [hal][neon] Fix macro definition for AArch64.
The fix is needed to prevent warnings when building for Armv7.
Alexander Alekhin [Wed, 10 Feb 2021 19:43:16 +0000 (19:43 +0000)]
Merge pull request #19494 from derbosper:js-build-config-fix
Alexander Alekhin [Wed, 10 Feb 2021 19:35:31 +0000 (19:35 +0000)]
Merge pull request #19439 from raaldrid:Exif_support_for_PNG_issue_16579
Mieszko Boczkowski [Wed, 10 Feb 2021 10:42:29 +0000 (11:42 +0100)]
Pass custom config file path as absolute
Alexander Alekhin [Tue, 9 Feb 2021 22:48:59 +0000 (22:48 +0000)]
Merge pull request #19480 from vrabaud:3.4
Alexander Alekhin [Tue, 9 Feb 2021 20:38:30 +0000 (20:38 +0000)]
Merge pull request #19488 from asmorkalov:as/nonfree_check
Alexander Alekhin [Tue, 9 Feb 2021 18:57:43 +0000 (18:57 +0000)]
Merge pull request #19471 from sturkmen72:patch-5
Rachel A [Mon, 1 Feb 2021 20:16:44 +0000 (12:16 -0800)]
Exif parsing for PNG files to support Exif orientation tag. Moved decoder specific Exif parsing to JPEG and PNG decoders, respectively. Issue 16579
Alexander Smorkalov [Tue, 9 Feb 2021 13:54:06 +0000 (16:54 +0300)]
Not not test stitiching with SURF, if NONFREE is disabled
Vincent Rabaud [Mon, 8 Feb 2021 15:53:37 +0000 (16:53 +0100)]
Disable thread sanitization when CV_USE_GLOBAL_WORKERS_COND_VAR is not set.
This fixes #19463
Suleyman TURKMEN [Sun, 7 Feb 2021 02:42:55 +0000 (05:42 +0300)]
Update imageSegmentation.cpp, imageSegmentation.py
Polina Smolnikova [Fri, 5 Feb 2021 21:24:27 +0000 (00:24 +0300)]
Merge pull request #19407 from rayonnant14:issue_19363
QRCodeDetector::decodeMulti() fixed invalid usage fixedType()
* fixed invalid usage fixedType()
changed default barcode type to CV_8UC1
added tests
added assert in case multi channel straight barcode input
* deleted extra wrap into OutputArray
* fix warnings
* objdetect(qr): remove unnecessary checks
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 4 Feb 2021 11:57:19 +0000 (11:57 +0000)]
Merge pull request #19428 from alalek:dnn_drop_misbehaved_clamp
Jebastin Nadar [Thu, 4 Feb 2021 08:50:08 +0000 (14:20 +0530)]
Merge pull request #19449 from SamFC10:tf-leakyrelu
* add LeakyRelu to tf-importer
* fix whitespace error
* added test for leakyrelu
Alexander Alekhin [Sat, 30 Jan 2021 12:02:47 +0000 (12:02 +0000)]
dnn: rename clamp() => normalize_axis()
Alexander Alekhin [Wed, 3 Feb 2021 11:08:24 +0000 (11:08 +0000)]
Merge pull request #19440 from paroj:pyexcept
Alexander Alekhin [Wed, 3 Feb 2021 09:16:06 +0000 (09:16 +0000)]
Merge pull request #19435 from l-bat:lb/onnx_normalize
Pavel Rojtberg [Tue, 2 Feb 2021 01:49:19 +0000 (02:49 +0100)]
python: also catch general c++ exceptions
they might be thrown from third-party code (notably Ogre in the ovis
module).
While Linux is kind enough to print them, they cause instant termination
on Windows.
Arguably, they do not origin from OpenCV itself, but still this helps
understanding what went wrong when calling an OpenCV function.
Alexander Alekhin [Tue, 2 Feb 2021 11:12:14 +0000 (11:12 +0000)]
Merge pull request #19443 from asmorkalov:as/guard_nonfree
Alexander Smorkalov [Tue, 2 Feb 2021 10:24:59 +0000 (13:24 +0300)]
Guard non-free usage in stitching as contrib can be built without it.
Liubov Batanina [Mon, 1 Feb 2021 09:38:33 +0000 (12:38 +0300)]
Added ONNX NormalizeL2 subgraph
Liangda-w [Mon, 1 Feb 2021 09:17:54 +0000 (10:17 +0100)]
Merge pull request #19419 from Liangda-w:patch-1
* Fix error in documentation for RGB->HSV convertion
* Update colors.markdown
Alexander Alekhin [Sun, 31 Jan 2021 17:41:24 +0000 (17:41 +0000)]
Merge pull request #19430 from alalek:fixup_19216
Alexander Alekhin [Sun, 31 Jan 2021 14:24:37 +0000 (14:24 +0000)]
Merge pull request #19427 from alalek:issue_19426
Alexander Alekhin [Sun, 31 Jan 2021 00:12:51 +0000 (00:12 +0000)]
js: fix SIMD build
Alexander Alekhin [Sat, 30 Jan 2021 12:37:57 +0000 (12:37 +0000)]
Merge pull request #19424 from alalek:cmake_linters_update
Alexander Alekhin [Sat, 30 Jan 2021 11:39:43 +0000 (11:39 +0000)]
Merge pull request #19057 from sl-sergei:changes_for_cuda_1d
Alexander Alekhin [Sat, 30 Jan 2021 11:32:27 +0000 (11:32 +0000)]
build: fix cv2.cpp compilation
Sergey Slashchinin [Tue, 8 Dec 2020 18:28:04 +0000 (21:28 +0300)]
Align 3.4 branch with master
Alexander Alekhin [Fri, 29 Jan 2021 16:59:13 +0000 (16:59 +0000)]
cmake: fix pylint/flake8 detection, update flake8 exclude
Alexander Alekhin [Fri, 29 Jan 2021 12:34:00 +0000 (12:34 +0000)]
Merge pull request #19395 from Ixarias:patch-1
Alexander Alekhin [Wed, 27 Jan 2021 18:32:33 +0000 (18:32 +0000)]
Merge pull request #19404 from LupusSanctus:am/text_graph_preproc
Anastasia Murzova [Tue, 26 Jan 2021 21:59:10 +0000 (00:59 +0300)]
Corrected SSD text graph generation
Ixarias [Mon, 25 Jan 2021 19:34:57 +0000 (13:34 -0600)]
Change Keymap wording for gray image in curve mode
Instead of being a copy of line 76, line 79 instead correctly indicates that it will show a histogram for a gray image in curve mode, as given by the code block at line 103 referencing image "gray" instead of image "im".
Alexander Alekhin [Tue, 26 Jan 2021 19:23:12 +0000 (19:23 +0000)]
Merge pull request #19403 from diablodale:fix_19402_python_test_filter_34
Dale Phurrough [Tue, 26 Jan 2021 17:32:20 +0000 (18:32 +0100)]
fix python test runner wildcard handling
* fix opencv/opencv#19402
Alexander Alekhin [Mon, 25 Jan 2021 22:08:24 +0000 (22:08 +0000)]
Merge pull request #19373 from l-bat:lb/tf_matmul_shared
Liubov Batanina [Mon, 25 Jan 2021 22:07:50 +0000 (01:07 +0300)]
Merge pull request #19372 from l-bat:lb/onnx_pads_calc
* Fixed bug with constant Div
* Supported constant mul and div for inputs with different shapes
Alexander Alekhin [Mon, 25 Jan 2021 13:54:00 +0000 (13:54 +0000)]
Merge pull request #19385 from alalek:ocl_isOpenCLActivated_update
Alexander Alekhin [Mon, 25 Jan 2021 13:32:42 +0000 (13:32 +0000)]
Merge pull request #19390 from tomoaki0705:fixCudaLegacyCalib3d
Alexander Alekhin [Mon, 25 Jan 2021 08:22:57 +0000 (08:22 +0000)]
Merge pull request #19344 from VadimLevin:dev/vlevin/generic-sequence-conversion
Tomoaki Teshima [Mon, 25 Jan 2021 08:14:37 +0000 (17:14 +0900)]
fix peaky test failure
* follow the review comment
Vadim Levin [Mon, 18 Jan 2021 13:09:11 +0000 (16:09 +0300)]
feat: common fixed size sequence conversion for Python bindings
Alexander Alekhin [Sun, 24 Jan 2021 15:23:34 +0000 (15:23 +0000)]
Merge pull request #19383 from tomoaki0705:fixWrongIndex
Alexander Alekhin [Sun, 24 Jan 2021 15:23:03 +0000 (15:23 +0000)]
Merge pull request #19382 from crackwitz:highgui-w32-remove-gutter
Tomoaki Teshima [Sun, 24 Jan 2021 11:29:52 +0000 (20:29 +0900)]
fix wrong index
Alexander Alekhin [Sun, 24 Jan 2021 01:24:32 +0000 (01:24 +0000)]
core(ocl): update isOpenCLActivated()
- reuse g_isOpenCLAvailable variable instead
Christoph Rackwitz [Sat, 23 Jan 2021 15:01:07 +0000 (16:01 +0100)]
highgui: remove gutter in window_w32
Alexander Alekhin [Fri, 22 Jan 2021 20:22:36 +0000 (20:22 +0000)]
Merge pull request #19376 from alalek:fixup_19105
Alexander Alekhin [Fri, 22 Jan 2021 20:05:58 +0000 (20:05 +0000)]
Merge pull request #19334 from alalek:fix_19134
Alexander Alekhin [Fri, 22 Jan 2021 19:50:25 +0000 (19:50 +0000)]
js(doc): fix path
Liubov Batanina [Fri, 22 Jan 2021 13:47:02 +0000 (16:47 +0300)]
Added shared weights for MatMul
Alexander Alekhin [Tue, 19 Jan 2021 21:56:42 +0000 (21:56 +0000)]
Merge pull request #19352 from mshabunin:new-forum-links
Maksim Shabunin [Tue, 19 Jan 2021 18:54:05 +0000 (21:54 +0300)]
Updated more links to forum.opencv.org
Alexander Alekhin [Mon, 18 Jan 2021 20:16:04 +0000 (20:16 +0000)]
Merge pull request #19336 from kyshel:patch-1
Alexander Alekhin [Mon, 18 Jan 2021 20:14:10 +0000 (20:14 +0000)]
Merge pull request #19312 from VadimLevin:dev/vlevin/clear-msg-for-failed-overload-resolution
Vadim Levin [Tue, 12 Jan 2021 14:50:07 +0000 (17:50 +0300)]
feat: add overload resolution exception for Python bindings
kyshel [Sat, 16 Jan 2021 15:40:02 +0000 (23:40 +0800)]
update xrange() to range()
update xrange() to range() as Python 2 has been deprecate, more info:
1. Python 2 has been no longer supported officially since January 1, 2020. Check https://www.python.org/doc/sunset-python-2/
2. xrange() was renamed to range() in Python 3. Check https://stackoverflow.com/questions/
17192158/nameerror-global-name-xrange-is-not-defined-in-python-3/
17192181#
17192181
update xrange() to range()
Update py_fourier_transform.markdown
update xrange() to range()
Alexander Alekhin [Fri, 15 Jan 2021 17:58:57 +0000 (17:58 +0000)]
core(ocl): fix lifetime handling of Image kernel args
Alexander Alekhin [Sun, 17 Jan 2021 22:00:00 +0000 (22:00 +0000)]
Merge pull request #19339 from ichisadashioko:modules_highgui_src_window_w32_typo
shioko [Sun, 17 Jan 2021 18:59:20 +0000 (18:59 +0000)]
fix typo of the word storage
Alexander Alekhin [Sat, 16 Jan 2021 18:58:02 +0000 (18:58 +0000)]
Merge pull request #19332 from alalek:xcode_ccache
Alexander Alekhin [Sat, 16 Jan 2021 18:42:19 +0000 (18:42 +0000)]
Merge pull request #19330 from l-bat:lb/onnx_mish_subgraph
Alexander Alekhin [Fri, 15 Jan 2021 19:25:55 +0000 (19:25 +0000)]
cmake: support ccache with Xcode generator
Liubov Batanina [Fri, 15 Jan 2021 11:01:48 +0000 (14:01 +0300)]
Added Mish ONNX subgraph
Francesco Petrogalli [Thu, 14 Jan 2021 12:01:36 +0000 (12:01 +0000)]
Merge pull request #19268 from fpetrogalli:tabs-summary-output
* [ts][summary.py] Extend `-o` to support tabs separated output.
* [ts][summary.py] Improve TABS sepatated output.
There is no need to print TAB at the beginning and at the end of each
row in the table.
Cosmetic change: using python list comprehension instead of for loop
to process a single row.
Alexander Alekhin [Tue, 12 Jan 2021 18:28:58 +0000 (18:28 +0000)]
Merge pull request #19300 from alkasm:patch-2
Alexander Alekhin [Tue, 12 Jan 2021 17:57:24 +0000 (17:57 +0000)]
Merge pull request #19216 from terfendail:wasm_fall
Alexander Reynolds [Sat, 9 Jan 2021 09:44:54 +0000 (01:44 -0800)]
hotfix: call isOpened() in python bg sub tutorial
https://github.com/opencv/opencv/issues/19299
Alexander Alekhin [Mon, 11 Jan 2021 20:58:33 +0000 (20:58 +0000)]
Merge pull request #19301 from krush11:3.4
Alexander Alekhin [Mon, 11 Jan 2021 20:54:53 +0000 (20:54 +0000)]
Merge pull request #19297 from raaldrid:Template_Match_Tutorial_fix_17739
Alexander Alekhin [Mon, 11 Jan 2021 20:04:49 +0000 (20:04 +0000)]
Merge pull request #19296 from raaldrid:Doc_issue_fix_18836_FULL
Alexander Alekhin [Mon, 11 Jan 2021 20:03:29 +0000 (20:03 +0000)]
Merge pull request #19291 from gpiffault:docs-js_usage-fix_imshow
Alexander Alekhin [Mon, 11 Jan 2021 20:02:51 +0000 (20:02 +0000)]
Merge pull request #19248 from LaurentBerger:forum
Rachel A [Fri, 8 Jan 2021 20:14:35 +0000 (12:14 -0800)]
Template Matching Tutorial issue fix https://github.com/opencv/opencv/issues/17739
Alexander Alekhin [Mon, 11 Jan 2021 19:12:41 +0000 (19:12 +0000)]
Merge pull request #19220 from alalek:dnn_tf_importer_error_reporting
Rachel A [Fri, 8 Jan 2021 00:42:13 +0000 (16:42 -0800)]
Solution to documentation issue https://github.com/opencv/opencv/issues/18836
LaurentBerger [Sun, 3 Jan 2021 09:31:58 +0000 (10:31 +0100)]
update forum link
Vitaly Tuzov [Fri, 25 Dec 2020 12:36:07 +0000 (15:36 +0300)]
Inlined WASM fallback intrinsics to avoid using of V_TypeTraits
krush11 [Sun, 10 Jan 2021 05:41:23 +0000 (11:11 +0530)]
added multi-config to regexp
Grégoire Piffault [Fri, 8 Jan 2021 10:48:57 +0000 (11:48 +0100)]
docs(tutorial_js_usage): fix imshow usage
notmatthancock [Tue, 5 Jan 2021 11:33:57 +0000 (05:33 -0600)]
Merge pull request #19258 from notmatthancock:doc/update-sift-patent-blurb
* Remove sentences about SIFT patent and code location
* Add note about patent in opencv-specific section
Alexander Alekhin [Fri, 1 Jan 2021 13:38:35 +0000 (13:38 +0000)]
copyright: 2021
Alexander Alekhin [Thu, 31 Dec 2020 10:33:59 +0000 (10:33 +0000)]
Merge pull request #19239 from justinchuby:justinchuby-doc-typo-hough-lines
Justin Chu [Wed, 30 Dec 2020 21:20:27 +0000 (16:20 -0500)]
Fix typo in hough_lines tutorial
Argument `minLinLength` -> `minLineLength`
Alexander Alekhin [Sat, 26 Dec 2020 09:40:29 +0000 (09:40 +0000)]
dnn: improve debugging of TensorFlow parsing errors
Zhuo Zhang [Thu, 24 Dec 2020 16:58:16 +0000 (00:58 +0800)]
Merge pull request #19203 from zchrissirhcz:fix-cvSaveImage
Fix cvSaveImage( ) function bug
* fix cvSaveImage crash
* replace emplace_back with {}, no C++11 required
* fix MacOSX build with vector's push_back