Alexander Alekhin
ad66b070a7
Merge pull request #19501 from komakai:android-ndk22
2021-02-14 12:41:33 +00:00
Alexander Alekhin
6f6dd227f8
Merge pull request #19523 from the-sparrow:master
2021-02-13 22:44:32 +00:00
Alexander Alekhin
d2d6eba16a
cmake: fix add_apple_compiler_options() calls and OBJCXX handling
2021-02-13 18:37:30 +00:00
Alexander Alekhin
cceec84139
Merge pull request #19520 from WeiChungChang:refine
2021-02-13 18:18:12 +00:00
the-sparrow
3d5f9e8b14
fix the spell error
2021-02-13 17:08:56 +08:00
Giles Payne
2cb48e034e
Build for NDK 22
2021-02-13 13:00:19 +09:00
Qoo
c909693d45
refine
2021-02-12 20:53:09 -05:00
Alexander Alekhin
e5d78960c6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-12 21:34:49 +00:00
Alexander Alekhin
fba70f7991
Merge pull request #19515 from zchrissirhcz:3.4-fix-mislinked-zlib-in-vcpkg-by-adjust-link-order
2021-02-12 20:28:52 +00:00
Zhuo Zhang
84a290097b
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
2021-02-12 22:19:35 +08:00
Anatoliy Talamanov
ba8d20e9ae
Merge pull request #19425 from TolyaTalamanov:at/async-infer
...
[G-API] Implement async infer
* Implement async infer
* Fix typo
2021-02-12 12:28:37 +00:00
Alexander Alekhin
767127c92e
Merge pull request #19505 from alalek:hotfix_19456
2021-02-11 18:52:56 +00:00
Alexander Alekhin
65b5d34aee
cmake: use INTERFACE_COMPILE_DEFINITIONS with definition
2021-02-11 14:06:54 +00:00
Francesco Petrogalli
6ee23c9b85
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.
2021-02-11 13:24:09 +00:00
Alexander Alekhin
cac5b0fe5a
Merge pull request #19494 from derbosper:js-build-config-fix
2021-02-10 19:43:16 +00:00
Tsukasa Sugiura
107f233626
Merge pull request #19484 from UnaNancyOwen:fix_highlevelapi
...
* [dnn] fix high level api for python
* [dnn] add test_textdetection_model_db
* [dnn] fix textdetection test only check type and shape
2021-02-10 19:42:00 +00:00
Cuntian Liu
0677f3e21c
Merge pull request #19452 from ctuu:patch-1
...
* fix: findCUDNN script
* Update FindCUDNN.cmake
2021-02-10 19:38:34 +00:00
Alexander Alekhin
93783df42a
Merge pull request #19439 from raaldrid:Exif_support_for_PNG_issue_16579
2021-02-10 19:35:31 +00:00
Dmitry Budnikov
1162cef978
Merge pull request #19495 from dbudniko:gapi_media_frame_size
...
Add Media Frame size function and corresponding tests
* add media frame size and tests
* Address comments from Ruslan and Asya
2021-02-10 19:23:54 +00:00
Mieszko Boczkowski
a3fb64d1cd
Pass custom config file path as absolute
2021-02-10 12:45:35 +01:00
Alexander Alekhin
7079e7ea5e
Merge pull request #19480 from vrabaud:3.4
2021-02-09 22:48:59 +00:00
Alexander Alekhin
4f39f8a8d0
Merge pull request #19488 from asmorkalov:as/nonfree_check
2021-02-09 20:38:30 +00:00
Alexander Alekhin
27bada6737
Merge pull request #19471 from sturkmen72:patch-5
2021-02-09 18:57:43 +00:00
Rachel A
650836d700
Exif parsing for PNG files to support Exif orientation tag. Moved decoder specific Exif parsing to JPEG and PNG decoders, respectively. Issue 16579
2021-02-09 10:35:27 -08:00
Anatoliy Talamanov
c527b3cefd
Merge pull request #19319 from TolyaTalamanov:at/introduce-gopaque-garray-for-python
...
[G-API] Introduce GOpaque and GArray for python
* Introduce GOpaque and GArray for python
* Fix ctor
* Avoid code duplication by using macros
* gapi: move Python-specific files to misc/python
* Fix windows build
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-02-09 13:55:16 +00:00
Alexander Smorkalov
3b9aebee11
Not not test stitiching with SURF, if NONFREE is disabled
2021-02-09 16:54:06 +03:00
Vincent Rabaud
847b16fb76
Disable thread sanitization when CV_USE_GLOBAL_WORKERS_COND_VAR is not set.
...
This fixes #19463
2021-02-09 14:12:39 +01:00
Ilya Churaev
8fa013309e
Merge pull request #19479 from ilyachur:remove_v0_multiply
...
* Switched to v1 Multiply
* Apply changes only for new OV
2021-02-09 09:46:28 +00:00
Anna Khakimova
7ab3a80d0a
Merge pull request #19233 from anna-khakimova:ak/simd_absdiffc
...
GAPI: SIMD optimization for AbsDiffC kernel
* SIMD optimization for AbsDiffC kernel
* Applied comments
* Applying comments and refactoring: Remove new univ intrinsics.
* Performance experiment
* Applied comments.Step2
* Applied comments. Step3
2021-02-08 13:02:35 +00:00
Alexander Alekhin
e5518ee657
Merge pull request #19422 from alalek:js_tutorial_intelligent_scissors_note
2021-02-07 20:07:19 +00:00
Suleyman TURKMEN
2387813428
Update imageSegmentation.cpp, imageSegmentation.py
2021-02-07 17:42:52 +03:00
Alexander Alekhin
0c31c0756c
Merge pull request #19468 from hmaarrfk:fix_apple_check
2021-02-06 14:54:49 +00:00
Mark Harfouche
7405075ede
CHange import order to avoid apple check error
2021-02-05 23:24:56 -05:00
Alexander Alekhin
6b474c4051
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-06 00:44:11 +00:00
Alexander Alekhin
a9c954e821
Merge pull request #19467 from alalek:hotfix_19411
2021-02-06 00:42:26 +00:00
Alexander Alekhin
b6933dbf3a
highgui(pollKey): properly handle no-GUI case
2021-02-05 23:51:52 +00:00
Alexander Alekhin
f46b1252c4
Merge pull request #19466 from alalek:hotfix_19259
2021-02-05 23:46:24 +00:00
Alexander Alekhin
e6959055b5
core(cuda.hpp): fix GpuMatND compilation with GCC < 5
2021-02-05 22:42:56 +00:00
Polina Smolnikova
0be18f5cb0
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>
2021-02-05 21:24:27 +00:00
Namgoo Lee
7ea21c4b3c
Merge pull request #19259 from nglee:dev_gpumatnd1
...
Minimal implementation of GpuMatND
* GpuMatND - minimal implementation
* GpuMatND - createGpuMatHeader
* GpuMatND - GpuData, offset, getDevicePtr(), license
* reviews
* reviews
2021-02-05 20:30:37 +00:00
Alexander Alekhin
9d227641c9
Merge pull request #19411 from crackwitz:highgui-pollkey
2021-02-05 20:18:53 +00:00
Alexander Alekhin
2a2e4e78bf
Merge pull request #19451 from alalek:cmake_mkl_tbb_oneapi_workaround
2021-02-05 14:22:43 +00:00
Anna Khakimova
fb3b297369
Merge pull request #18466 from anna-khakimova:ak/simd_addw_bitwise
...
GAPI: SIMD optimization for AddWeighted kernel.
* Add, sub, absdiff kernels optimization
* AddW kernel
* And, or kernels
* AddWeighted refactoring and SIMD opt for AbsDiffC kernel
* Remove simd opt of AbsDiffC kernel
* Refactoring
* Applied comments
* Refactoring.Step2
* Applied comments.Step2
2021-02-05 14:21:42 +00:00
Alexander Alekhin
050327a1e2
Merge pull request #19456 from alalek:fixup_19447
2021-02-04 16:03:24 +00:00
Alexander Alekhin
4f08bb5046
Merge pull request #19428 from alalek:dnn_drop_misbehaved_clamp
2021-02-04 11:57:19 +00:00
Jebastin Nadar
09d2ca17cf
Merge pull request #19449 from SamFC10:tf-leakyrelu
...
* add LeakyRelu to tf-importer
* fix whitespace error
* added test for leakyrelu
2021-02-04 08:50:08 +00:00
Alexander Alekhin
83aa711346
dnn: rename clamp() => normalize_axis()
2021-02-04 08:13:55 +00:00
Alexander Alekhin
fcff767a7f
cmake(tbb): fix target_compile_definitions() with "UNKNOWN" target
...
- https://gitlab.kitware.com/cmake/cmake/-/issues/19434
2021-02-03 22:18:39 +00:00
Alexander Alekhin
7a282a8892
cmake: workaround oneAPI problem with -DMKL_WITH_TBB=ON
2021-02-03 19:41:54 +00:00
Alexander Alekhin
863ecded30
Merge pull request #19440 from paroj:pyexcept
2021-02-03 11:08:24 +00:00