platform/upstream/opencv.git
4 years agoUpdate grfmt_pxm.cpp
tpoisonooo [Tue, 7 Apr 2020 09:01:45 +0000 (17:01 +0800)]
Update grfmt_pxm.cpp

remove comment in .ppm

4 years agoMerge pull request #16653 from alalek:core_inputarray_matexpr
Alexander Alekhin [Fri, 10 Apr 2020 16:57:17 +0000 (16:57 +0000)]
Merge pull request #16653 from alalek:core_inputarray_matexpr

4 years agoMerge pull request #17023 from poelmanc:patch-1
Alexander Alekhin [Fri, 10 Apr 2020 16:32:15 +0000 (16:32 +0000)]
Merge pull request #17023 from poelmanc:patch-1

4 years agoRemove std::binary_function as it's invalid C++
Conrad Poelman [Thu, 9 Apr 2020 09:19:23 +0000 (05:19 -0400)]
Remove std::binary_function as it's invalid C++

std::binary_function was deprecated with C++11 and removed in C++17. It provided just two typedefs which in this case were unused.

4 years agoMerge pull request #17028 from xipingyan:patch-1
Xiping Yan [Fri, 10 Apr 2020 12:23:13 +0000 (20:23 +0800)]
Merge pull request #17028 from xipingyan:patch-1

* Update OpenCVFindVA_INTEL.cmake

When set env VA_INTEL_IOCL_ROOT, "if($ENV{VA_INTEL_IOCL_ROOT})" don't work.
    My modification as follow.

    -    if($ENV{VA_INTEL_IOCL_ROOT})
    +    if(DEFINED ENV{VA_INTEL_IOCL_ROOT})

    Refer: https://cmake.org/cmake/help/latest/variable/ENV.html

* based on merge comment, update code

4 years agocore(test): add InputArray(MatExpr) fetch test
Alexander Alekhin [Sat, 7 Mar 2020 17:16:06 +0000 (17:16 +0000)]
core(test): add InputArray(MatExpr) fetch test

4 years agoMerge pull request #16975 from shimat:Branch_4.3.0
Alexander Alekhin [Thu, 9 Apr 2020 08:28:20 +0000 (08:28 +0000)]
Merge pull request #16975 from shimat:Branch_4.3.0

4 years agofix error at #include <window_winrt_bridge.hpp>
shimat [Sat, 4 Apr 2020 00:39:28 +0000 (09:39 +0900)]
fix error at #include <window_winrt_bridge.hpp>

4 years agoMerge pull request #17010 from alalek:issue_16896
Alexander Alekhin [Wed, 8 Apr 2020 14:50:00 +0000 (14:50 +0000)]
Merge pull request #17010 from alalek:issue_16896

4 years agoMerge pull request #16993 from asmorkalov:as/faq_wiki
Alexander Alekhin [Wed, 8 Apr 2020 13:56:57 +0000 (13:56 +0000)]
Merge pull request #16993 from asmorkalov:as/faq_wiki

4 years agoMerge pull request #16979 from dkurt:dnn_fused_resize_conv
Alexander Alekhin [Wed, 8 Apr 2020 13:29:51 +0000 (13:29 +0000)]
Merge pull request #16979 from dkurt:dnn_fused_resize_conv

4 years agoMigrated FAQ page to Github Wiki
Alexander Smorkalov [Wed, 8 Apr 2020 10:55:44 +0000 (13:55 +0300)]
Migrated FAQ page to Github Wiki

4 years agoMerge pull request #17014 from dkurt:dnn_onnx_elu
Alexander Alekhin [Wed, 8 Apr 2020 10:18:33 +0000 (10:18 +0000)]
Merge pull request #17014 from dkurt:dnn_onnx_elu

4 years agoFix Elu import from ONNX
Dmitry Kurtaev [Wed, 8 Apr 2020 09:09:45 +0000 (12:09 +0300)]
Fix Elu import from ONNX

4 years agocmake: update generation of 'uninstall' target
Alexander Alekhin [Tue, 7 Apr 2020 22:01:18 +0000 (22:01 +0000)]
cmake: update generation of 'uninstall' target

Details: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake

4 years agoMerge pull request #16905 from dkurt:dnn_tf2_keras
Alexander Alekhin [Tue, 7 Apr 2020 14:59:42 +0000 (14:59 +0000)]
Merge pull request #16905 from dkurt:dnn_tf2_keras

4 years agoMerge pull request #16889 from mehlukas:3.4-consolidateImshow
mehlukas [Tue, 7 Apr 2020 14:14:51 +0000 (16:14 +0200)]
Merge pull request #16889 from mehlukas:3.4-consolidateImshow

* consolidate tutorials on image read/display/write

* fix unsused variables

* apply requested changes

* apply requested changes

* fix mistake

4 years agoMerge pull request #16840 from l-bat:matmul_inputs
Liubov Batanina [Tue, 7 Apr 2020 14:12:18 +0000 (17:12 +0300)]
Merge pull request #16840 from l-bat:matmul_inputs

* Supported FullyConnected layer with two inputs

* Skipped test

* Fix conditions

* Added OpenCL support

* Supported ReduceMean3D

* Supported Expand layer

* Fix warning

* Added Normalize subgraph

* refactoring

* Used addLayer

* Fix check

* Used addLayer

* Skip failed test

* Added normalize1 subgraph

* Fix comments

4 years agoMerge pull request #16984 from CSharperMantle:argparse-patch-1
Alexander Alekhin [Tue, 7 Apr 2020 12:54:27 +0000 (12:54 +0000)]
Merge pull request #16984 from CSharperMantle:argparse-patch-1

4 years agoMerge pull request #17005 from tomoaki0705:fixHoughKernelLocal
Alexander Alekhin [Tue, 7 Apr 2020 10:05:44 +0000 (10:05 +0000)]
Merge pull request #17005 from tomoaki0705:fixHoughKernelLocal

4 years agofix OpenCL spec violation
Tomoaki Teshima [Tue, 7 Apr 2020 05:34:55 +0000 (14:34 +0900)]
fix OpenCL spec violation

4 years agoMerge pull request #16878 from dkurt:fix_16877
Alexander Alekhin [Mon, 6 Apr 2020 18:14:35 +0000 (18:14 +0000)]
Merge pull request #16878 from dkurt:fix_16877

4 years agoMerge pull request #16970 from l-bat:fix_enet
Alexander Alekhin [Mon, 6 Apr 2020 15:57:08 +0000 (15:57 +0000)]
Merge pull request #16970 from l-bat:fix_enet

4 years agocore(MatExpr) fetch result before InputArray wrap
Alexander Alekhin [Fri, 21 Feb 2020 20:30:18 +0000 (20:30 +0000)]
core(MatExpr) fetch result before InputArray wrap

- avoid multiple expression evaluations
- avoid issues with reduced support of InputArray::EXPR

4 years agoMerge pull request #16967 from benji1123:patch-1
Alexander Alekhin [Mon, 6 Apr 2020 15:17:23 +0000 (15:17 +0000)]
Merge pull request #16967 from benji1123:patch-1

4 years agoMerge pull request #16992 from afowles:fix-forEach-segfault
Adam Fowles [Mon, 6 Apr 2020 14:49:02 +0000 (10:49 -0400)]
Merge pull request #16992 from afowles:fix-forEach-segfault

* Fixed divide by zero error in forEach

* Dedicated assertion for !empty

4 years agoMerge pull request #16982 from tomoaki0705:houghLinesOCL
Alexander Alekhin [Mon, 6 Apr 2020 14:35:14 +0000 (14:35 +0000)]
Merge pull request #16982 from tomoaki0705:houghLinesOCL

4 years agoFix ENet test with OpenVINO 2020.2
Liubov Batanina [Fri, 3 Apr 2020 12:40:11 +0000 (15:40 +0300)]
Fix ENet test with OpenVINO 2020.2

4 years agotypo fix
Ben Li [Fri, 3 Apr 2020 01:32:03 +0000 (21:32 -0400)]
typo fix

4 years agoMerge pull request #16980 from albert-github:feature/bug_doxyfile
Alexander Alekhin [Mon, 6 Apr 2020 11:37:17 +0000 (11:37 +0000)]
Merge pull request #16980 from albert-github:feature/bug_doxyfile

4 years agoswitch to argparse
Bao "Mantle" Rong [Sun, 5 Apr 2020 03:57:04 +0000 (11:57 +0800)]
switch to argparse

4 years agoIncorrect PREDEFINED setting.
albert-github [Sat, 4 Apr 2020 13:30:38 +0000 (15:30 +0200)]
Incorrect PREDEFINED setting.

The PREDEFINED setting for  had a space between the define name and the equal sign and this is not allowed, it results in the warning:
```
error: Illegal PREDEFINED format '=', no define name specified
```
according to the documentation explicitly states that no space is allowed:
> The PREDEFINED tag can be used to specify one or more macro names that are defined before the preprocessor is started (similar to the -D option of e.g. gcc). The argument of the tag is a list of macros of the form: name or name=definition (no spaces). If the definition and the "=" are omitted, "=1" is assumed. To prevent a macro definition from being undefined via #undef or recursively expanded use the := operator instead of the = operator.

4 years agolet the test pass on Mali G52 (ODROID-N2)
Tomoaki Teshima [Sat, 4 Apr 2020 16:39:47 +0000 (01:39 +0900)]
let the test pass on Mali G52 (ODROID-N2)

4 years agoSupport FusedResizeAndPadConv2D from TensorFlow
Dmitry Kurtaev [Sat, 4 Apr 2020 13:02:17 +0000 (16:02 +0300)]
Support FusedResizeAndPadConv2D from TensorFlow

4 years agoCase sensitive dnn layers types
Dmitry Kurtaev [Sun, 22 Mar 2020 15:50:15 +0000 (18:50 +0300)]
Case sensitive dnn layers types

4 years agoMerge tag '3.4.10'
Alexander Alekhin [Fri, 3 Apr 2020 11:24:31 +0000 (11:24 +0000)]
Merge tag '3.4.10'

4 years agorelease: OpenCV 3.4.10
Alexander Alekhin [Thu, 2 Apr 2020 19:59:58 +0000 (19:59 +0000)]
release: OpenCV 3.4.10

4 years agoMerge pull request #16959 from alalek:winpack_dldt_update
Alexander Alekhin [Thu, 2 Apr 2020 18:13:58 +0000 (18:13 +0000)]
Merge pull request #16959 from alalek:winpack_dldt_update

4 years agoMerge pull request #16956 from alalek:ocl_control_buffer_mapping
Alexander Alekhin [Thu, 2 Apr 2020 17:56:50 +0000 (17:56 +0000)]
Merge pull request #16956 from alalek:ocl_control_buffer_mapping

4 years agowinpack_dldt: readme update
Alexander Alekhin [Thu, 2 Apr 2020 16:51:28 +0000 (16:51 +0000)]
winpack_dldt: readme update

4 years agoMerge pull request #16953 from mshabunin:fix-msmf-writer-fps
Alexander Alekhin [Thu, 2 Apr 2020 13:06:34 +0000 (13:06 +0000)]
Merge pull request #16953 from mshabunin:fix-msmf-writer-fps

4 years agocore(ocl): options to control buffer access flags
Alexander Alekhin [Thu, 2 Apr 2020 10:10:57 +0000 (10:10 +0000)]
core(ocl): options to control buffer access flags

- control using of clEnqueueMapBuffer or clEnqueueReadBuffer[Rect]
- added benchmarks with OpenCL buffer access use cases

4 years agovideoio: fixed MSMF writer fps handling
Maksim Shabunin [Thu, 2 Apr 2020 09:49:46 +0000 (12:49 +0300)]
videoio: fixed MSMF writer fps handling

4 years agoMerge pull request #16950 from alalek:fix_16945
Alexander Alekhin [Thu, 2 Apr 2020 09:26:09 +0000 (09:26 +0000)]
Merge pull request #16950 from alalek:fix_16945

4 years agoMerge pull request #16948 from alalek:warning_16739
Alexander Alekhin [Thu, 2 Apr 2020 09:25:47 +0000 (09:25 +0000)]
Merge pull request #16948 from alalek:warning_16739

4 years agostitching: fix range check in DpSeamFinder::computeCosts
Alexander Alekhin [Wed, 1 Apr 2020 18:45:02 +0000 (18:45 +0000)]
stitching: fix range check in DpSeamFinder::computeCosts

4 years agoMerge pull request #16947 from mshabunin:fix-msmf-convert-format
Alexander Alekhin [Wed, 1 Apr 2020 18:50:12 +0000 (18:50 +0000)]
Merge pull request #16947 from mshabunin:fix-msmf-convert-format

4 years agocore: emit warning ONCE on ambiguous MatExpr processing
Alexander Alekhin [Wed, 1 Apr 2020 18:34:20 +0000 (18:34 +0000)]
core: emit warning ONCE on ambiguous MatExpr processing

4 years agovideoio: fixed conversion in MSMF backend
Maksim Shabunin [Wed, 1 Apr 2020 11:40:11 +0000 (14:40 +0300)]
videoio: fixed conversion in MSMF backend

4 years agoMerge pull request #16938 from alalek:winpack_samples_update
Alexander Alekhin [Tue, 31 Mar 2020 22:46:13 +0000 (01:46 +0300)]
Merge pull request #16938 from alalek:winpack_samples_update

4 years agobuild: updates for winpack dldt
Alexander Alekhin [Tue, 31 Mar 2020 12:19:34 +0000 (12:19 +0000)]
build: updates for winpack dldt

4 years agoMerge pull request #16932 from alalek:imgproc_resize_nn_cleanup
Alexander Alekhin [Mon, 30 Mar 2020 15:38:40 +0000 (15:38 +0000)]
Merge pull request #16932 from alalek:imgproc_resize_nn_cleanup

4 years agoMerge pull request #16928 from alalek:fix_15075
Alexander Alekhin [Mon, 30 Mar 2020 13:07:35 +0000 (13:07 +0000)]
Merge pull request #16928 from alalek:fix_15075

4 years agoMerge pull request #16922 from alalek:imgcodecs_test_io_grayscale
Alexander Alekhin [Sun, 29 Mar 2020 16:36:06 +0000 (16:36 +0000)]
Merge pull request #16922 from alalek:imgcodecs_test_io_grayscale

4 years agoimgproc(resize): drop unused 'pix_size4'
Alexander Alekhin [Sun, 29 Mar 2020 02:41:50 +0000 (02:41 +0000)]
imgproc(resize): drop unused 'pix_size4'

4 years agoimgproc(resize): fix resizeNNInvoker handling of generic pixel size
Alexander Alekhin [Sun, 29 Mar 2020 02:08:27 +0000 (02:08 +0000)]
imgproc(resize): fix resizeNNInvoker handling of generic pixel size

4 years agoimgcodecs(test): rework common I/O test, added grayscale mode
Alexander Alekhin [Fri, 27 Mar 2020 01:40:28 +0000 (01:40 +0000)]
imgcodecs(test): rework common I/O test, added grayscale mode

4 years agoMerge pull request #16919 from alalek:backport_16860
Alexander Alekhin [Fri, 27 Mar 2020 16:44:05 +0000 (16:44 +0000)]
Merge pull request #16919 from alalek:backport_16860

4 years agoMerge pull request #16918 from alalek:build_warnings_3.4
Alexander Alekhin [Fri, 27 Mar 2020 16:43:23 +0000 (16:43 +0000)]
Merge pull request #16918 from alalek:build_warnings_3.4

4 years agoMerge pull request #16847 from alalek:build_opencv_winpack_dldt
Alexander Alekhin [Fri, 27 Mar 2020 16:06:19 +0000 (16:06 +0000)]
Merge pull request #16847 from alalek:build_opencv_winpack_dldt

4 years ago-calib3d updates documentation
Moritz Fischer-Gundlach [Sun, 16 Feb 2020 21:00:42 +0000 (22:00 +0100)]
-calib3d updates documentation

backporting commit 99436bb8cfe3f362a43ce339517b4d771648cd26

4 years agoeliminate build warnings
Alexander Alekhin [Fri, 27 Mar 2020 11:39:07 +0000 (11:39 +0000)]
eliminate build warnings

4 years agoMerge pull request #16916 from cyyever:fix_freebsd_build
Alexander Alekhin [Fri, 27 Mar 2020 11:38:56 +0000 (11:38 +0000)]
Merge pull request #16916 from cyyever:fix_freebsd_build

4 years agofix freebsd build
cyy [Fri, 27 Mar 2020 10:12:10 +0000 (18:12 +0800)]
fix freebsd build

4 years agobuild: add winpack_dldt build scripts
Alexander Alekhin [Sat, 14 Mar 2020 23:17:25 +0000 (23:17 +0000)]
build: add winpack_dldt build scripts

4 years agoMerge pull request #16903 from alalek:fix_16823_3.4
Alexander Alekhin [Wed, 25 Mar 2020 15:53:08 +0000 (15:53 +0000)]
Merge pull request #16903 from alalek:fix_16823_3.4

4 years agoMerge pull request #16901 from alalek:cmake_ie_find_extra_libs
Alexander Alekhin [Wed, 25 Mar 2020 15:52:15 +0000 (15:52 +0000)]
Merge pull request #16901 from alalek:cmake_ie_find_extra_libs

4 years agoImport TF2.0 network from Keras
Dmitry Kurtaev [Wed, 25 Mar 2020 12:34:28 +0000 (15:34 +0300)]
Import TF2.0 network from Keras

4 years agocore(persistence): fix resource leaks - force closing files
Alexander Alekhin [Tue, 24 Mar 2020 08:58:30 +0000 (08:58 +0000)]
core(persistence): fix resource leaks - force closing files

backporting commit 673eb2b00628c0a702fb1653cfa06860cf85be19

4 years agocmake: fix find process for InferenceEngine extra libraries
Alexander Alekhin [Wed, 25 Mar 2020 02:23:39 +0000 (02:23 +0000)]
cmake: fix find process for InferenceEngine extra libraries

4 years agoMerge pull request #16897 from mshabunin:fix-kw-issues-2
Alexander Alekhin [Tue, 24 Mar 2020 10:48:40 +0000 (10:48 +0000)]
Merge pull request #16897 from mshabunin:fix-kw-issues-2

4 years agocalib3d: check input values in dls
Maksim Shabunin [Tue, 24 Mar 2020 09:22:26 +0000 (12:22 +0300)]
calib3d: check input values in dls

4 years agoMerge pull request #16894 from alalek:update_tbb
Alexander Alekhin [Tue, 24 Mar 2020 08:40:46 +0000 (08:40 +0000)]
Merge pull request #16894 from alalek:update_tbb

4 years agoMerge pull request #16893 from alalek:update_libwebp
Alexander Alekhin [Tue, 24 Mar 2020 08:40:18 +0000 (11:40 +0300)]
Merge pull request #16893 from alalek:update_libwebp

* 3rdparty: update libwebp 1.0.3 => 1.1.0

- https://github.com/webmproject/libwebp/releases/tag/v1.1.0

* 3rdparty(libwebp): re-apply OpenCV patches

4 years agoMerge pull request #16892 from alalek:update_libtiff
Alexander Alekhin [Tue, 24 Mar 2020 08:39:39 +0000 (08:39 +0000)]
Merge pull request #16892 from alalek:update_libtiff

4 years agoMerge pull request #16891 from alalek:update_libjpeg-turbo
Alexander Alekhin [Tue, 24 Mar 2020 08:39:05 +0000 (08:39 +0000)]
Merge pull request #16891 from alalek:update_libjpeg-turbo

4 years ago3rdparty: update TBB 2020.0 => 2020.1
Alexander Alekhin [Mon, 23 Mar 2020 20:37:08 +0000 (20:37 +0000)]
3rdparty: update TBB 2020.0 => 2020.1

4 years ago3rdparty: update libtiff 4.0.10 => 4.1.0
Alexander Alekhin [Mon, 23 Mar 2020 18:43:45 +0000 (18:43 +0000)]
3rdparty: update libtiff 4.0.10 => 4.1.0

- https://gitlab.com/libtiff/libtiff/-/tags/v4.1.0

4 years ago3rdparty: libjpeg-turbo 2.0.2 => 2.0.4
Alexander Alekhin [Mon, 23 Mar 2020 18:09:21 +0000 (18:09 +0000)]
3rdparty: libjpeg-turbo 2.0.2 => 2.0.4

- https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.4

4 years agoMerge pull request #16885 from mshabunin:fix-msvc-warn
Alexander Alekhin [Mon, 23 Mar 2020 16:23:37 +0000 (16:23 +0000)]
Merge pull request #16885 from mshabunin:fix-msvc-warn

4 years agoMerge pull request #16817 from dkurt:dnn_onnx_lstm
Alexander Alekhin [Mon, 23 Mar 2020 16:22:17 +0000 (16:22 +0000)]
Merge pull request #16817 from dkurt:dnn_onnx_lstm

4 years agoAdd checks for LSTM initial h and c
Dmitry Kurtaev [Sun, 22 Mar 2020 13:04:30 +0000 (16:04 +0300)]
Add checks for LSTM initial h and c

4 years agoMerge pull request #16883 from alalek:cmake_cmp0066
Alexander Alekhin [Mon, 23 Mar 2020 12:58:44 +0000 (12:58 +0000)]
Merge pull request #16883 from alalek:cmake_cmp0066

4 years agoMerge pull request #16882 from alalek:cmake_apps_install_list
Alexander Alekhin [Mon, 23 Mar 2020 12:58:23 +0000 (12:58 +0000)]
Merge pull request #16882 from alalek:cmake_apps_install_list

4 years agocalib3d: fixed VS2019 warning C4756
Maksim Shabunin [Mon, 23 Mar 2020 11:46:21 +0000 (14:46 +0300)]
calib3d: fixed VS2019 warning C4756

4 years agocmake: set CMP0066 => NEW
Alexander Alekhin [Mon, 23 Mar 2020 01:15:49 +0000 (01:15 +0000)]
cmake: set CMP0066 => NEW

4 years agocmake(apps): support OPENCV_INSTALL_APPS_LIST
Alexander Alekhin [Sun, 22 Mar 2020 23:55:11 +0000 (23:55 +0000)]
cmake(apps): support OPENCV_INSTALL_APPS_LIST

Usage:
- cmake -DOPENCV_INSTALL_APPS_LIST=opencv_version ...

4 years agoMerge pull request #16864 from alalek:issue_16857
Alexander Alekhin [Sun, 22 Mar 2020 20:15:57 +0000 (23:15 +0300)]
Merge pull request #16864 from alalek:issue_16857

4 years agoBidirectional LSTM
Dmitry Kurtaev [Sat, 21 Mar 2020 21:20:36 +0000 (00:20 +0300)]
Bidirectional LSTM

4 years agoMerge pull request #16867 from bencsikandrei:fix_typo_cmake_detect_python
Alexander Alekhin [Sat, 21 Mar 2020 17:04:34 +0000 (17:04 +0000)]
Merge pull request #16867 from bencsikandrei:fix_typo_cmake_detect_python

4 years agoMerge pull request #16865 from alalek:doc_fix_wrong_see_also
Alexander Alekhin [Sat, 21 Mar 2020 17:04:09 +0000 (17:04 +0000)]
Merge pull request #16865 from alalek:doc_fix_wrong_see_also

4 years agofix: minor typo in CMakeCVDetectPython
Andrei-Florin BENCSIK [Sat, 21 Mar 2020 09:15:07 +0000 (11:15 +0200)]
fix: minor typo in CMakeCVDetectPython

4 years agoobjdetect(QR): avoid bug with empty input
Alexander Alekhin [Sat, 21 Mar 2020 00:51:34 +0000 (00:51 +0000)]
objdetect(QR): avoid bug with empty input

4 years agodoc: fix misused "see also" doxygen command
Alexander Alekhin [Sat, 21 Mar 2020 00:25:49 +0000 (00:25 +0000)]
doc: fix misused "see also" doxygen command

4 years agoimgproc: add src.empty() checks in filter operations
Alexander Alekhin [Fri, 20 Mar 2020 21:04:29 +0000 (21:04 +0000)]
imgproc: add src.empty() checks in filter operations

4 years agoMerge pull request #16858 from alalek:core_fix_empty_iterator_begin_end
Alexander Alekhin [Fri, 20 Mar 2020 19:32:55 +0000 (19:32 +0000)]
Merge pull request #16858 from alalek:core_fix_empty_iterator_begin_end

4 years agocore: fix .begin()/.end() of empty Mat
Alexander Alekhin [Fri, 20 Mar 2020 13:04:04 +0000 (13:04 +0000)]
core: fix .begin()/.end() of empty Mat

4 years agoMerge pull request #16832 from liqi-c:3.4-tengine-android
NesQl [Fri, 20 Mar 2020 10:10:39 +0000 (18:10 +0800)]
Merge pull request #16832 from liqi-c:3.4-tengine-android

* Add android support for tengine

* modify tengine download use commit id

* Del some invalid log in Tengine

* Test. default enable tengine

* ndk version judegment

* Close test . set Tengine default OFF

* Logic problem

* test .Android NDK judgement .

* Cmake error modify.

* cmake: cleanup tengine scripts

* cmake: use tengine target name

* cmake: disable testing of BUILD_ANDROID_PROJECTS=OFF

* Close test .

4 years agoMerge pull request #16853 from SimpleVlad:note
Dizhenin Vlad [Thu, 19 Mar 2020 21:39:54 +0000 (00:39 +0300)]
Merge pull request #16853 from SimpleVlad:note

Add link to article for sample "Intelligent scissors"

* Add link to article

* Add autors name

* Fix whitespace

4 years agoMerge pull request #16828 from paroj:nmspy
Alexander Alekhin [Thu, 19 Mar 2020 16:43:43 +0000 (16:43 +0000)]
Merge pull request #16828 from paroj:nmspy