Alexander Alekhin
364702b1c9
cmake(3rdparty): use EXCLUDE_FROM_ALL
2020-10-28 11:56:12 +00:00
Alexander Alekhin
e8058b9fdb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-21 15:55:23 +00:00
Alexander Alekhin
d2dbc9d7a0
Merge pull request #18589 from alalek:issue_13328
2020-10-15 18:43:48 +00:00
Odianosen Ejale
862fc06b6f
Fixed and updated OpenCL-VA interoperability
2020-09-25 16:11:50 +03:00
NesQl
3fc1487cc9
Merge pull request #18323 from liqi-c:tengine-lite-update
...
Tengine lite update
* update tengine
* Modify for arm32 build.
* format optimization
* add teng_ befor some tengine api
* update graph_t to teng_graph_t
* update graph_t to teng_graph_t
* Code structure optimization
* optimization
* optimization
* remove space
* update tengine url
Co-authored-by: liqi <qli@openailab.com>
2020-09-23 09:34:29 +00:00
Alexander Alekhin
b23d377567
ffmpeg/4.x: update FFmpeg wrapper
...
- FFmpeg 4.3.1
2020-09-08 10:18:37 +00:00
Alexander Alekhin
f56445d7ca
ffmpeg/3.4: update FFmpeg wrapper
...
- FFmpeg 3.4.8
2020-09-07 17:55:22 +00:00
Vadim Levin
0384eb7d8c
3rdparty: integrate OpenJPEG build to the OpenCV CMake
...
- adopted build scripts
- OpenJPEG build warnings are suppressed
2020-09-02 20:45:35 +00:00
Vadim Levin
0c84b91dde
3rdparty: add OpenJPEG library source code (tag v2.3.1)
...
- https://github.com/uclouvain/openjpeg/releases/tag/v2.3.1
- src/lib/openjp2
- readme files
2020-09-02 20:17:01 +00:00
Alexander Alekhin
fa25faa2d2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-06 14:15:52 +00:00
Maksim Shabunin
866468cc3e
Fix Carotene compilation with XCode
2020-07-30 22:52:29 +03:00
Alexander Alekhin
a711e2aa41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-29 21:19:09 +00:00
Alexander Alekhin
cd8262eb79
Merge pull request #17650 from alalek:update_libjpeg-turbo
2020-06-24 10:57:37 +00:00
Alexander Alekhin
ad930f6216
3rdparty: libjpeg-turbo 2.0.4 => 2.0.5
...
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5
2020-06-24 06:28:16 +00:00
Alexander Alekhin
f061a0ab36
3rdparty: libjpeg 9d
...
http://www.ijg.org/files/jpegsrc.v9d.tar.gz
2020-06-23 20:35:56 +00:00
Alexander Alekhin
e3d502310f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-19 07:33:50 +00:00
NesQl
b10ab79743
Merge pull request #17468 from liqi-c:sharedlib_build_problem
...
TEngine installation rules fix for static build
* Modify cmake config error for -DBUILD_SHARED_LIBS=OFF
* Modify for not install tengine include directory
* Update compile error.
* move install command to tengine/CMakeLists.txt
* rm include dir when make install,only build static lib will install libtengine.a
2020-06-17 09:05:04 +00:00
Alexander Alekhin
fd498501d6
ffmpeg/4.4: update FFmpeg wrapper
...
- FFmpeg 4.2.3
2020-06-09 10:41:08 +03:00
Alexander Alekhin
b44302382d
ffmpeg/3.4: update FFmpeg wrapper
...
- FFmpeg 3.4.7
2020-06-08 21:03:05 +00:00
Alexander Alekhin
0f3c82e73b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-08 19:50:55 +00:00
Alexander Alekhin
852b0226e0
3rdparty: update TBB 2020.1 => 2020.2
...
https://github.com/oneapi-src/oneTBB/releases/tag/v2020.2
2020-06-08 11:04:33 +00:00
Alexander Alekhin
21e28adb87
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-22 19:50:14 +00:00
Nesterov Alexander
735c31bb4a
Resolve type conflict
2020-05-20 18:05:27 +03:00
Nesterov Alexander
b7253e3280
Update version quirc
2020-05-20 17:55:14 +03:00
Alexander Alekhin
c722625f28
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-28 16:53:19 +00:00
Alexander Alekhin
288fa70ed9
dnn(protobuf): backport AllowUnknownField(), SetRecursionLimit()
...
- limit recursion in SkipField*() calls
2020-04-25 20:45:43 +00:00
Alexander Alekhin
ca9756f6a1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-13 20:00:12 +00:00
Alexander Alekhin
49a75079f2
Merge pull request #17047 from alalek:fix_permissions
2020-04-13 12:34:08 +00:00
Alexander Alekhin
f0ffc52435
fix files permissions
2020-04-13 04:29:55 +00:00
Conrad Poelman
b77fe9d624
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.
2020-04-10 16:16:52 +03:00
Alexander Alekhin
ef395c3866
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-24 11:12:11 +00:00
Alexander Alekhin
f44a0960df
Merge pull request #16894 from alalek:update_tbb
2020-03-24 08:40:46 +00:00
Alexander Alekhin
b1ed003d08
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
2020-03-24 08:40:18 +00:00
Alexander Alekhin
22d930998b
Merge pull request #16892 from alalek:update_libtiff
2020-03-24 08:39:39 +00:00
Alexander Alekhin
fa002bde01
3rdparty: update TBB 2020.0 => 2020.1
2020-03-23 20:37:08 +00:00
Alexander Alekhin
13c4dc0e69
3rdparty: update libtiff 4.0.10 => 4.1.0
...
- https://gitlab.com/libtiff/libtiff/-/tags/v4.1.0
2020-03-23 18:43:45 +00:00
Alexander Alekhin
ad4e5dbd3d
3rdparty: libjpeg-turbo 2.0.2 => 2.0.4
...
- https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.4
2020-03-23 18:26:18 +00:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
NesQl
bf224e61a9
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 .
2020-03-20 10:10:39 +00:00
Alexander Alekhin
11b08b5ff3
ffmpeg/4.x: update FFmpeg plugin
2020-03-11 10:57:47 +00:00
Alexander Alekhin
155b751a75
ffmpeg/3.4: update FFmpeg wrapper
...
- FFmpeg 3.4.7
2020-03-10 19:05:50 +00:00
Alexander Alekhin
9b3be01b83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-09 20:27:34 +00:00
NesQl
0bcdf7d03e
Merge pull request #16724 from liqi-c:3.4-tengine
...
* Add Tengine support .
* Modify printf to CV_LOG_WARNING
* a few minor fixes in the code
* Renew Tengine version
* Add header file for CV_LOG_WARNING
* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp
* remove trailing whitespace
* Remove trailing whitespace
* Modify for compile problem
* Modify some code style error
* remove whitespace
* Move some code style problem
* test
* add ios limit and build problem
* Modified as alalek suggested
* Add cmake 2.8 support
* modify cmake 3.5.1 problem
* test and set BUILD_ANDROID_PROJECTS OFF
* remove some compile error
* remove some extra code in tengine
* close test.
* Test again
* disable android.
* delete ndk version judgement
* Remove setenv() call . and add License information
* Set tengine default OFF. Close test .
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2020-03-09 14:59:23 +00:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Ivan Galanin
f9bd025722
Merge pull request #16639 from iigalanin:patch-1
...
* Update to new ICV packages
MacOS ia32 ICV package is no longer built.
* cmake(ippicv): add Apple 32-bit check
* Updated commit hash
2020-02-25 22:04:11 +03:00
Alexander Alekhin
b29512032a
3rdparty(openexr): fix compilation with MSVS2019
2020-02-21 17:48:28 +03:00
Alexander Alekhin
560f85f8e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-28 14:26:57 +03:00
Alexander Alekhin
ffaf15d0d9
cmake: reuse OpenCV NEON detection in carotene
...
- use carotene if NEON available only
2020-01-24 16:42:56 +03:00
Alexander Alekhin
3d14dd4e39
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-22 16:58:30 +03:00
Alexander Alekhin
f429cee5d1
Merge pull request #16369 from kraj:gcc10
2020-01-17 08:58:20 +00:00
Khem Raj
2bd9488475
carotene: Replace ipcp-unit-growth with ipa-cp-unit-growth on gcc >= 10
...
gcc 10+ has renamed this option, therefore check for gcc version before
deciding which name to use for opt parameter
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-01-16 11:02:25 -08:00
Alexander Alekhin
4c86fc13cb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-19 15:09:05 +03:00
Alexander Alekhin
28a5f7d66b
3rdparty: TBB version 2019u8 => 2020.0
2019-12-18 23:14:38 +00:00
Alexander Alekhin
c6c8783c60
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-16 21:30:30 +00:00
Tatsuro Shibamura
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00
Alexander Alekhin
ba7b0f4c54
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-15 11:23:46 +00:00
Alexander Alekhin
60f81032bb
Merge pull request #16157 from alalek:update_libwebp_1.0.3
...
* 3rdparty: update libwebp 1.0.2 => 1.0.3
https://github.com/webmproject/libwebp/releases/tag/v1.0.3
* 3rdparty(libwebp): re-apply patches
2019-12-13 17:54:42 +03:00
Alexander Alekhin
a45928045a
Merge pull request #16150 from alalek:cmake_avoid_deprecated_link_private
...
* cmake: avoid deprecated LINK_PRIVATE/LINK_PUBLIC
see CMP0023 (CMake 2.8.12+)
* cmake: fix 3rdparty list
- don't include OpenCV modules
2019-12-13 17:52:40 +03:00
Alexander Alekhin
744798aadd
ffmpeg/4.x: update FFmpeg plugin
2019-11-19 22:04:44 +00:00
Alexander Alekhin
d00eb451bf
ffmpeg/3.4: update FFmpeg wrapper
2019-11-18 19:13:45 +00:00
Alexander Alekhin
fc41c18c6f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-18 13:56:24 +03:00
Alexander Alekhin
7ecdcf6ca6
build: GCC9 compilation
2019-11-12 18:49:34 +03:00
Alexander Alekhin
a74fe2ec01
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-20 21:11:49 +00:00
Alexander Alekhin
eabbe38001
Merge pull request #15554 from alalek:pr15422_patch_files
...
* 3rdparty: libpng v1.6.37 MSA patch (pr15422)
original files: https://github.com/glennrp/libpng/tree/v1.6.37/mips
* 3rdparty: libwebp MSA asm patch (pr15422)
2019-09-21 00:07:24 +03:00
mipsopen-fwu
b1ea91d8bd
Merge pull request #15422 from mipsopen-fwu:msa-dev
...
* Added MSA implementations for mips platforms. Intrinsics for MSA and build scripts for MIPS platforms are added.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed some unused code in mips.toolchain.cmake.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Added comments for mips toolchain configuration and disabled compiling warnings for libpng.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Fixed the build error of unsupported opcode 'pause' when mips isa_rev is less than 2.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed FP16 related item in MSA option defines in OpenCVCompilerOptimizations.cmake.
2. Use CV_CPU_COMPILE_MSA instead of __mips_msa for MSA feature check in cv_cpu_dispatch.h.
3. Removed hasSIMD128() in intrin_msa.hpp.
4. Define CPU_MSA as 150.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed unnecessary CV_SIMD128_64F guarding in intrin_msa.hpp.
2. Removed unnecessary CV_MSA related code block in dotProd_8u().
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Defined CPU_MSA_FLAGS_ON as "-mmsa".
2. Removed CV_SIMD128_64F guardings in intrin_msa.hpp.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed unused msa_mlal_u16() and msa_mlal_s16 from msa_macros.h.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
2019-09-20 19:52:48 +03:00
Alexander Alekhin
95a55250a7
ffmpeg/4.x: update FFmpeg plugin
...
ffmpeg: 4.1.3 -> 4.2.1
libvpx: 1.8.0 -> 1.8.1
2019-09-10 03:13:21 +00:00
Alexander Alekhin
6a49887695
ffmpeg/3.4: update FFmpeg wrapper
2019-09-05 21:36:06 +00:00
Alexander Alekhin
a7b954f655
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-23 19:24:37 +03:00
Alexander Alekhin
6bf6d1dc6b
Merge pull request #15373 from pmur:libpng-vsx-fix
2019-08-22 20:54:34 +00:00
Paul E. Murphy
8aca1934ff
libpng: update check for VSX enablement
...
The deprecated flag ENABLE_VSX should not be used to enable this
feature. Instead, use the baseline cpu feature set to determine.
2019-08-22 10:08:01 -05:00
Rosen Penev
58ca013b90
Merge pull request #15279 from neheb:patch-1
...
* jas_stream: Add definition for L_tmpnam if missing
uClibc-ng for some reason does not provide a definition when some
deprecated APIs are disabled. Value taken from the musl libc.
* 3rdparty: move uClibc-ng workaround into config file
2019-08-21 12:59:09 +03:00
Alexander Alekhin
19a4b51371
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-16 18:48:08 +03:00
Alexander Alekhin
5ef548a985
cmake: update initialization
2019-08-08 15:23:16 +03:00
Alexander Alekhin
174b4ce29d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-08-05 18:11:43 +00:00
Alexander Alekhin
d2c64b566b
Merge pull request #15227 from tomoaki0705:fixFallThroughCarotene
2019-08-05 12:44:00 +00:00
Tomoaki Teshima
d6ba235655
fix fall through warning
2019-08-05 17:42:48 +09:00
Alexander Alekhin
0cf479dd5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-25 19:21:47 +00:00
Hugo Lindström
2ee00e7f7d
Merge pull request #15059 from hugolm84:improved-support-for-wince
...
* Improve support for Windows Embedded Compact
* Remove redundant set(WINCE true) and format CMake
2019-07-24 23:12:09 +03:00
Alexander Alekhin
43eba3d750
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-04 18:44:13 +03:00
Alexander Alekhin
ca022fdb4c
3rdparty(itt): support AARCH64
2019-07-03 18:35:43 +03:00
Alexander Alekhin
097d81363b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-07-02 21:17:45 +00:00
Alexander Alekhin
43e457c883
3rdparty: TBB version 2018u1 => 2019u8
...
- make it configurable via OPENCV_TBB_RELEASE + OPENCV_TBB_RELEASE_MD5
- remove legacy support
2019-06-29 11:16:49 +00:00
Alexander Alekhin
26dfa5e77c
ffmpeg: win32 wrapper update
2019-06-16 16:20:40 +00:00
Alexander Alekhin
6aab6a251c
ffmpeg: update 3.4.6
...
libvpx: 1.8.0
2019-06-12 16:54:47 +00:00
Alexander Alekhin
11b020b9f9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-10 19:05:28 +00:00
Alexander Alekhin
878af7ada8
Merge pull request #14725 from alalek:update_openexr_2.3.0
...
3rdparty: update OpenEXR 2.3.0 (#14725 )
* openexr 2.2.1
* openexr 2.3.0
* openexr: build fixes
* openexr: build dwa tables on-demand
2019-06-10 20:04:23 +03:00
Alexander Alekhin
f3de2b4be7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-05 19:11:52 +03:00
Alexander Alekhin
1febb12942
3rdparty: apply protobuf v3.5.1..v3.5.2 patch
...
https://github.com/protocolbuffers/protobuf/compare/v3.5.1..v3.5.2
2019-06-04 12:57:34 +03:00
Alexander Alekhin
9802b4e123
Merge pull request #14707 from alalek:update_libwebp_1.0.2
2019-06-04 09:21:35 +00:00
Alexander Alekhin
e1ef7a2288
Merge pull request #14705 from alalek:update_libjpeg_9c
2019-06-04 09:21:17 +00:00
Alexander Alekhin
f768f89803
Merge pull request #14704 from alalek:fix_missing_files_libjpeg_turbo_2.0.2
2019-06-04 09:19:58 +00:00
Alexander Alekhin
f1b6228d4f
3rdparty(webp): enable -std=c99
2019-06-03 22:23:34 +00:00
Alexander Alekhin
d58f9ae824
3rdparty: update libwebp 1.0.0 => 1.0.2
...
https://github.com/webmproject/libwebp/releases/tag/v1.0.2
2019-06-03 22:23:34 +00:00
Alexander Alekhin
0ec72cbd10
3rdparty: update libjpeg 9c
...
https://www.ijg.org/
2019-06-03 16:21:02 +03:00
Alexander Alekhin
68e220e7bb
3rdparty: fix missing files from libjpeg-turbo 2.0.2
2019-06-03 15:42:51 +03:00
Alexander Alekhin
143b3d2b5b
3rdparty(libpng): re-apply OpenCV patches
2019-06-03 15:04:51 +03:00
Alexander Alekhin
e96c94c4e4
3rdparty: update libpng 1.6.37
...
http://www.libpng.org/pub/png/libpng.html
https://github.com/glennrp/libpng/releases
2019-06-03 14:49:44 +03:00
Alexander Alekhin
43de95eb19
3rdparty(libpng): fix leak in png_handle_eXIf
...
backporting of commit: 419a6d51b3
2019-05-29 20:15:55 +00:00
Alexander Alekhin
419a6d51b3
3rdparty(libpng): fix leak in png_handle_eXIf
...
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13314
ported commit: a142b7a543
2019-05-29 18:51:52 +00:00
Alexander Alekhin
dfb9832a25
cmake(protobuf): ensure using of own headers
2019-04-15 22:28:33 +00:00