Dale Phurrough [Mon, 1 Mar 2021 21:42:13 +0000 (22:42 +0100)]
noexcept def construct Mat, UMat, Mat_, MatSize, MatStep
Anatoliy Talamanov [Mon, 1 Mar 2021 15:52:11 +0000 (18:52 +0300)]
Merge pull request #19322 from TolyaTalamanov:at/python-callbacks
[G-API] Introduce cv.gin/cv.descr_of for python
* Implement cv.gin/cv.descr_of
* Fix macos build
* Fix gcomputation tests
* Add test
* Add using to a void exceeded length for windows build
* Add using to a void exceeded length for windows build
* Fix comments to review
* Fix comments to review
* Update from latest master
* Avoid graph compilation to obtain in/out info
* Fix indentation
* Fix comments to review
* Avoid using default in switches
* Post output meta for giebackend
Mikhail Nikolskii [Mon, 1 Mar 2021 15:51:04 +0000 (07:51 -0800)]
Merge pull request #19460 from mikhail-nikolskiy:videoio-hw
videoio: HW decode/encode in FFMPEG backend; new properties with support in FFMPEG/GST/MSMF
* HW acceleration in FFMPEG backend
* fixes on Windows, remove D3D9
* HW acceleration in FFMPEG backend
* fixes on Windows, remove D3D9
* improve va test
* Copyright
* check LIBAVUTIL_BUILD >= AV_VERSION_INT(55, 78, 100) // FFMPEG 3.4+
* CAP_MSMF test on .mp4
* .mp4 in test
* improve va test
* Copyright
* check LIBAVUTIL_BUILD >= AV_VERSION_INT(55, 78, 100) // FFMPEG 3.4+
* CAP_MSMF test on .mp4
* .mp4 in test
* .avi for GStreamer test
* revert changes around seek()
* cv_writer_open_with_params
* params.warnUnusedParameters
* VideoCaptureParameters in GStreamer
* open_with_params
* params->getUnused
* Reduce PSNR threshold 33->32 (other tests use 30)
* require FFMPEG 4.0+; PSNR 30 as in other tests
* GStreamer AVI-demux plugin not installed in Ubuntu test environment?
* fix build on very old ffmpeg
* fix build on very old ffmpeg
* fix build issues
* fix build issues (static_cast)
* FFMPEG built on Windows without H264 encoder?
* fix for write_nothing test on VAAPI
* fix warnings
* fix cv_writer_get_prop in plugins
* use avcodec_get_hw_frames_parameters; more robust fallback to SW codecs
* internal function hw_check_device() for device check/logging
* two separate tests for HW read and write
* image size 640x480 in encode test
* WITH_VA=ON (only .h headers used in OpenCV, no linkage dependency)
* exception on VP9 SW encoder?
* rebase master; refine info message
* videoio: fix FFmpeg standalone plugin build
* videoio(ffmpeg): eliminate MSVC build warnings
* address review comments
* videoio(hw): update videocapture_acceleration.read test
- remove parallel decoding by SW code path
- check PSNR against the original generated image
* videoio: minor fixes
* videoio(test): disable unsupported MSMF cases (SW and HW)
* videoio(test): update PSNR thresholds for HW acceleration read
* videoio(test): update debug messages
* "hw_acceleration" whitelisting parameter
* little optimization in test
* D3D11VA supports decoders, doesn't support encoders
* videoio(test): adjust PSNR threshold in write_read_position tests
* videoio(ffmpeg): fix rejecting on acceleration device name mismatch
* videoio(ffmpeg): fix compilation USE_AV_HW_CODECS=0, add more debug logging
* videoio: rework VideoAccelerationType behavior
- enum is not a bitset
- default value is backend specific
- only '_NONE' and '_ANY' may fallback on software processing
- specific H/W acceleration doesn't fallback on software processing. It fails if there is no support for specified H/W acceleration.
* videoio(test): fix for current FFmpeg wrapper
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Sun, 28 Feb 2021 21:39:30 +0000 (00:39 +0300)]
Merge pull request #19640 from alalek:issue_19639
calib3d(usac): do not crash on empty models
* calib3d(test): regression test for issue 19639
* calib3d(usac): do not crash in setModelParameters()
* calib3d(usac): handle empty models in isModelGood()
Alexander Alekhin [Sat, 27 Feb 2021 17:41:57 +0000 (17:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 27 Feb 2021 17:32:42 +0000 (17:32 +0000)]
Merge pull request #19603 from federicohml:fix-ub-copy-make-const-border-8u
Alexander Alekhin [Sat, 27 Feb 2021 17:31:59 +0000 (17:31 +0000)]
Merge pull request #19636 from LaurentBerger:blendlinear_py
Federico Bolelli [Sat, 27 Feb 2021 17:27:24 +0000 (18:27 +0100)]
Merge pull request #19631 from prittt:sota-ccl
* Add Spaghetti algorithm for CCL
* Add stat tests for new and old algorithms
* Switch license header to short version
LaurentBerger [Sat, 27 Feb 2021 12:18:13 +0000 (13:18 +0100)]
python binding blendLinear
Alexander Alekhin [Fri, 26 Feb 2021 21:43:37 +0000 (21:43 +0000)]
Merge pull request #19628 from alalek:fix_19566
Federico Martinez [Tue, 23 Feb 2021 07:44:17 +0000 (08:44 +0100)]
Fix UB in CopyMakeConstBoder_8u
Caused by overflow of arithmetic operators conversion rank
Anatoliy Talamanov [Fri, 26 Feb 2021 12:53:30 +0000 (15:53 +0300)]
Merge pull request #19487 from TolyaTalamanov:at/support-nireq-option
[G-API] Support multiple asynchronous requests
* Support nireq option
* Disable tests to check CI
* Fix bug with hanging
* WA to green CI
* Snapshot
* Simplify RequestPool
* Add default values to id
* Fix win warning
Alexander Alekhin [Fri, 26 Feb 2021 11:45:52 +0000 (11:45 +0000)]
Merge pull request #19633 from mshabunin:add-gstreamer-video
Maksim Shabunin [Fri, 26 Feb 2021 09:25:43 +0000 (12:25 +0300)]
gstreamer: add video module
Orest Chura [Thu, 25 Feb 2021 21:58:52 +0000 (00:58 +0300)]
Merge pull request #19497 from OrestChura:oc/kmeans_ptest
[G-API]: Performance tests for kmeans
* - Perf.Tests for kmeans(2D, 3D (Point2f/3f), ND (Mat))
- New file for common parts of acc. and perf. tests for core kernels added
- Some typos corrections
* Applying comments
Alexander Alekhin [Thu, 25 Feb 2021 20:16:50 +0000 (20:16 +0000)]
imgproc(warpAffine): avoid buffer indexes overflow in SIMD code
Giles Payne [Thu, 25 Feb 2021 19:14:11 +0000 (04:14 +0900)]
Merge pull request #19597 from komakai:android-ndk-camera
Android NDK camera support
* Add native camera video backend for Android
* In the event of a "No buffer available error" wait for the appropriate callback and retry
* Fix stale context when creating a new AndroidCameraCapture
* Add property handling
Alexander Alekhin [Thu, 25 Feb 2021 16:33:55 +0000 (16:33 +0000)]
Merge pull request #19627 from mshabunin:plugin-default-suffix
Alexander Alekhin [Thu, 25 Feb 2021 16:31:47 +0000 (16:31 +0000)]
Merge pull request #19625 from mshabunin:static-analysis-issues-34
Alexander Alekhin [Thu, 25 Feb 2021 16:30:17 +0000 (16:30 +0000)]
Merge pull request #19620 from mshabunin:static-analysis-issues
Maksim Shabunin [Thu, 25 Feb 2021 13:44:55 +0000 (16:44 +0300)]
plugins: add suffix to default OUTPUT_NAME
Maksim Shabunin [Wed, 24 Feb 2021 17:31:00 +0000 (20:31 +0300)]
Fixed several issues found by static analysis
Maksim Shabunin [Wed, 24 Feb 2021 17:31:00 +0000 (20:31 +0300)]
Fixed several issues found by static analysis
Alexander Alekhin [Thu, 25 Feb 2021 07:55:38 +0000 (07:55 +0000)]
Merge pull request #19609 from alalek:videoio_fix_gstreamer_alignment_bug
Alexander Alekhin [Wed, 24 Feb 2021 21:07:13 +0000 (21:07 +0000)]
Merge pull request #19503 from komakai:fix-android-putget
Alexander Alekhin [Wed, 24 Feb 2021 21:03:01 +0000 (21:03 +0000)]
Merge pull request #19618 from alalek:videoio_plugin_exception_messages
Alexander Alekhin [Wed, 24 Feb 2021 17:45:19 +0000 (17:45 +0000)]
videoio: dump exception's messages in plugins
Alexander Alekhin [Wed, 24 Feb 2021 10:08:11 +0000 (10:08 +0000)]
Merge pull request #19610 from mshabunin:plugin-va-compile
Alexander Alekhin [Wed, 24 Feb 2021 09:28:47 +0000 (09:28 +0000)]
Merge pull request #19568 from alalek:cmake_plugin_fix_osx_standalone
Alexander Alekhin [Wed, 24 Feb 2021 08:40:42 +0000 (08:40 +0000)]
videoio(gstreamer): rework retrieveFrame() to handle strides
Maksim Shabunin [Sat, 20 Feb 2021 09:22:51 +0000 (12:22 +0300)]
Fix standalone plugin compilation for Windows
Maksim Shabunin [Sat, 20 Feb 2021 10:49:33 +0000 (13:49 +0300)]
Enable VA only on selected x86/64 platforms
Alexander Alekhin [Tue, 23 Feb 2021 22:42:51 +0000 (22:42 +0000)]
Merge pull request #19535 from alalek:issue_18897
WeiChungChang [Tue, 23 Feb 2021 21:09:55 +0000 (16:09 -0500)]
Merge pull request #19529 from WeiChungChang:3.4
* improve map allocation check
* fix accoring to CR
Alexander Alekhin [Tue, 23 Feb 2021 03:44:04 +0000 (06:44 +0300)]
Merge pull request #19601 from alalek:hotfix_19536
Alexander Alekhin [Tue, 23 Feb 2021 03:31:29 +0000 (03:31 +0000)]
dnn: fix build (nullptr issue)
Alexander Alekhin [Mon, 22 Feb 2021 20:04:11 +0000 (20:04 +0000)]
Merge pull request #19536 from WeiChungChang:ReduceMemory
Alexander Alekhin [Mon, 22 Feb 2021 20:02:40 +0000 (20:02 +0000)]
Merge pull request #19564 from sturkmen72:patch-4
WeiChungChang [Mon, 22 Feb 2021 16:44:00 +0000 (11:44 -0500)]
Merge pull request #19552 from WeiChungChang:partialSort
apply partial sort to save computations
* apply partial sort
* fix typo
* fix accroding to CR
Alexander Alekhin [Mon, 22 Feb 2021 08:29:10 +0000 (08:29 +0000)]
Merge pull request #19594 from alalek:hotfix_19470
Alexander Alekhin [Sun, 21 Feb 2021 21:22:29 +0000 (21:22 +0000)]
core(parallel): fix JS build, fix OpenMP version dump
Alexander Alekhin [Sun, 21 Feb 2021 20:14:09 +0000 (20:14 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Suleyman TURKMEN [Wed, 17 Feb 2021 09:04:49 +0000 (12:04 +0300)]
Update python samples
Larry Wei [Sun, 21 Feb 2021 19:22:43 +0000 (03:22 +0800)]
Merge pull request #19586 from larryw3i:patch-2
* Update py_setup_in_ubuntu.markdown
Alexander Alekhin [Sun, 21 Feb 2021 19:20:03 +0000 (19:20 +0000)]
Merge pull request #19584 from diablodale:fix19573_ocl_move
Alexander Alekhin [Mon, 15 Feb 2021 21:36:33 +0000 (21:36 +0000)]
core(InputArray): replace STD_ARRAY to MATX
- remove duplication kind
Sergey Krivohatskiy [Sun, 21 Feb 2021 15:57:18 +0000 (18:57 +0300)]
Merge pull request #19580 from SergeyKrivohatskiy:patch-1
* Fixed OCL implementation of pyrlk
If prevPts size is (N, 1) (which is a default layout for converting `vector<Point2f>` to `UMat`) the `prevPts.cols == 1` and optical flow will be calculated for the first point only.
Getting `prevPts.total()` as in line 1048 is the correct way to get points count.
* fixed compilation warning (size_t to int)
Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Alexander Alekhin [Sat, 20 Feb 2021 22:54:55 +0000 (22:54 +0000)]
Merge pull request #19585 from alalek:hotfix_19540
Alexander Alekhin [Sat, 20 Feb 2021 22:47:35 +0000 (22:47 +0000)]
Merge pull request #19545 from SamFC10:exp
Alexander Alekhin [Sat, 20 Feb 2021 22:46:55 +0000 (22:46 +0000)]
Merge pull request #19582 from alalek:backport_19572
Alexander Alekhin [Sat, 20 Feb 2021 18:30:49 +0000 (18:30 +0000)]
build warning (windows 32-bit)
Dale Phurrough [Sat, 20 Feb 2021 17:56:04 +0000 (18:56 +0100)]
add move construct/assigns to cv::ocl main classes
- enables inline construct and assigns with r-values
- enables compiler-created default move
construct/assigns
- includes test cases
SamFC10 [Sat, 20 Feb 2021 16:46:00 +0000 (22:16 +0530)]
Added exp layer
Alexander Smorkalov [Sat, 20 Feb 2021 16:28:08 +0000 (19:28 +0300)]
Merge pull request #19540 from asmorkalov:as/openexr_comression_options
OpenEXR compression options
* Adding possibility to select the compression type for the OpenEXR format.
There are compression modes other than the default that are more suited for certain data. Mainly grainy/noisy data.
* Code review fixes.
Co-authored-by: Daniel Rydstrom <daniel.rydstrom@sick.se>
Dale Phurrough [Sat, 20 Feb 2021 13:16:47 +0000 (14:16 +0100)]
add noexcept to default constructors of cv::ocl
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
also be noexcept
original commit:
77e26a7db3447b7569dfee28fb8a253b8ed93e2b
- handled KernelArg, Image2D
Alexander Alekhin [Sat, 20 Feb 2021 15:59:38 +0000 (15:59 +0000)]
Merge pull request #19572 from diablodale:fix19571_ocl_noexcept
Dale Phurrough [Sat, 20 Feb 2021 13:16:47 +0000 (14:16 +0100)]
add noexcept to default constructors of cv::ocl
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
also be noexcept
Alexander Alekhin [Fri, 19 Feb 2021 16:23:33 +0000 (16:23 +0000)]
cmake(plugins): build without opencv_*.so on OSX
Alexander Alekhin [Fri, 19 Feb 2021 11:53:04 +0000 (11:53 +0000)]
Merge pull request #19561 from mshabunin:plugin-load-now
Alexander Alekhin [Fri, 19 Feb 2021 11:45:00 +0000 (11:45 +0000)]
Merge pull request #19562 from alalek:libva_dynamic
Alexander Alekhin [Fri, 19 Feb 2021 11:03:31 +0000 (11:03 +0000)]
Merge pull request #19541 from alalek:core_includes
Alexander Alekhin [Fri, 19 Feb 2021 10:36:26 +0000 (10:36 +0000)]
samples(va): fix build warnings, use cv::format()
Alexander Alekhin [Thu, 18 Feb 2021 13:36:07 +0000 (13:36 +0000)]
core(libva): use dynamic loader
Giles Payne [Fri, 19 Feb 2021 08:10:11 +0000 (17:10 +0900)]
Fix/optimize Android put/get functions
Alexander Alekhin [Thu, 18 Feb 2021 19:42:08 +0000 (19:42 +0000)]
Merge pull request #19560 from mshabunin:va-sample-fix
Alexander Alekhin [Thu, 18 Feb 2021 19:41:21 +0000 (19:41 +0000)]
Merge pull request #19534 from tomoaki0705:fixCudaFiltersRace
Alexander Alekhin [Thu, 18 Feb 2021 15:33:02 +0000 (15:33 +0000)]
Merge pull request #19559 from APrigarina:calib3d_fix
Maksim Shabunin [Thu, 18 Feb 2021 14:19:47 +0000 (17:19 +0300)]
VA sample: device autodetection changed
APrigarina [Thu, 18 Feb 2021 13:18:19 +0000 (16:18 +0300)]
handle empty cameraMatrix
Maksim Shabunin [Thu, 18 Feb 2021 11:45:08 +0000 (14:45 +0300)]
plugins: use RTLD_NOW instead of RTLD_LAZY
Anastasia M [Wed, 17 Feb 2021 18:01:41 +0000 (21:01 +0300)]
Merge pull request #19417 from LupusSanctus:am/text_graph_identity
* Corrected SSD text graph generation for Identity nodes
* Added minor code corrections
Alexander Alekhin [Wed, 17 Feb 2021 17:10:44 +0000 (17:10 +0000)]
Merge pull request #19474 from aryanshomray:darknet_tanh
Liangqian [Wed, 17 Feb 2021 17:05:08 +0000 (01:05 +0800)]
Merge pull request #19026 from chargerKong:dualquat
Dual quaternion
* create dual quaternion;
basic operations, functions(exp,log,norm,inv), to/from mat, sclerp.
* add dqb, dqs, gdqb, to/from affine3;
change algorithm of norm, inv, getTranslation, createFromPitch, normalize;
change type translation to Vec3;
comment improve;
* try fix warning: unreferenced local function
* change exp calculation;
add func(obj) operations;
* Change the algorithm of log function;
add assumeUnit in getRotation;
remove dqs;
change std::vector to InputArray
* fix warning: doxygen and Vec<double, 0>
* fix warning: doxygen and Vec<double, 0>
* add inputarray param for gdqb
* change int to size_t
* win cl warning fix
* replace size_t by int at using Mat.at() function
* replace double by float
* interpolation fix
* replace (i, 0) to (i)
* core(quat): exclude ABI, test_dualquaternion=>test_quaternion.cpp
Co-authored-by: arsaratovtsev <arsaratovtsev@intel.com>
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Andrey Golubev [Wed, 17 Feb 2021 15:23:29 +0000 (17:23 +0200)]
Merge pull request #19496 from andrey-golubev:master
[G-API] Change memory measurement statistic in Fluid tests
* Change memory measurement statistic in Fluid tests
* Delete irrelevant comment
Aryansh Omray [Wed, 17 Feb 2021 13:19:52 +0000 (18:49 +0530)]
TanH darknet and test
Anatoliy Talamanov [Wed, 17 Feb 2021 11:43:18 +0000 (14:43 +0300)]
Merge pull request #19533 from TolyaTalamanov:at/async-requests-hotfix
[G-API] Async infer request hotfix
* Fix hanging on empty roi list
* Prevent possible data race
* Clean up
Alexander Alekhin [Wed, 17 Feb 2021 10:19:20 +0000 (10:19 +0000)]
Merge pull request #19550 from Nico769:patch-1
Nicola Landolfi [Wed, 17 Feb 2021 09:03:16 +0000 (10:03 +0100)]
Fix single-word typo
Matt Alvarado [Tue, 16 Feb 2021 16:18:43 +0000 (11:18 -0500)]
Merge pull request #19498 from mattalvarado:fix_findcirclesgrid
* Properly handle empty centers in findCirclesGrid
* Address alalek comments. Add unit test to validate bugfix
* fix build warnings, remove unrelated comment
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
Alexander Alekhin [Tue, 16 Feb 2021 11:12:05 +0000 (11:12 +0000)]
Merge pull request #19470 from alalek:core_parallel_plugins
Alexander Alekhin [Tue, 16 Feb 2021 10:06:31 +0000 (10:06 +0000)]
core: include version.hpp in cvdef.h, fix precomp.hpp usage
Qoo [Tue, 16 Feb 2021 01:14:07 +0000 (20:14 -0500)]
save allocation of memory for fake image
Alexander Alekhin [Mon, 15 Feb 2021 20:00:11 +0000 (23:00 +0300)]
Merge pull request #19528 from smirnov-alexey:as/gapi_optional_fix
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
Dmitry Budnikov [Mon, 15 Feb 2021 19:57:22 +0000 (22:57 +0300)]
Merge pull request #19516 from dbudniko:dbudniko/gapi_render_frame_cpu
Render Frame NV12 on CPU
* render frame on CPU
* doxygen fix
* address review from Alexey
* comment fixes
* Address comments from Ruslan
* remove NV12 specific
* mat clone and more renaming
* misprint fix
Amir Tulegenov [Mon, 15 Feb 2021 19:55:57 +0000 (01:55 +0600)]
Merge pull request #19392 from amirtu:OCV-165_finalize_goodFeaturesToTrack_returns_also_corner_value_PR
* goodFeaturesToTrack returns also corner value
(cherry picked from commit
4a8f06755cf93785a82a455a2035a2ff572cafae)
* Added response to GFTT Detector keypoints
(cherry picked from commit
b88fb40c6ea037e5283e4fbcf0ffde160c65a035)
* Moved corner values to another optional variable to preserve backward compatibility
(cherry picked from commit
6137383d32859efad7b44dd8a798e7b69f68dec5)
* Removed corners valus from perf tests and better unit tests for corners values
(cherry picked from commit
f3d0ef21a78b7d0dc8696c457a6fabecfbe5e8ff)
* Fixed detector gftt call
(cherry picked from commit
be2975553ba01a7d2e63f549fadccec6d7d56797)
* Restored test_cornerEigenValsVecs
(cherry picked from commit
ea3e11811faee63487449983c0b80ff8ee35bbac)
* scaling fixed;
mineigen calculation rolled back;
gftt function overload added (with quality parameter);
perf tests were added for the new api function;
external bindings were added for the function (with different alias);
fixed issues with composition of the output array of the new function (e.g. as requested in comments) ;
added sanity checks in the perf tests;
removed C API changes.
* minor change to GFTTDetector::detect
* substitute ts->printf with EXPECT_LE
* avoid re-allocations
Co-authored-by: Anas <anas.el.amraoui@live.com>
Co-authored-by: amir.tulegenov <amir.tulegenov@xperience.ai>
Alexander Alekhin [Wed, 3 Feb 2021 22:04:35 +0000 (22:04 +0000)]
core(parallel): plugins support
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()
Tomoaki Teshima [Mon, 15 Feb 2021 12:01:41 +0000 (21:01 +0900)]
remove danger race condition
Smirnov Alexey [Sun, 14 Feb 2021 21:20:08 +0000 (00:20 +0300)]
Fix optional move constructor
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 [Sun, 14 Feb 2021 12:41:33 +0000 (12:41 +0000)]
Merge pull request #19501 from komakai:android-ndk22
Alexander Alekhin [Sat, 13 Feb 2021 22:44:32 +0000 (22:44 +0000)]
Merge pull request #19523 from the-sparrow:master
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