Alexander Alekhin
b6670f3ac3
ffmpeg/4.x: update FFmpeg wrapper 2021.03
...
- FFmpeg 4.3.2
2021-03-03 11:41:36 +00:00
Alexander Alekhin
ec4baf337a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-02 21:47:19 +00:00
Alexander Alekhin
ba7d0c5b23
Merge pull request #19659 from alalek:update_libtiff
2021-03-02 12:15:33 +00:00
Alexander Alekhin
5d499a185b
Merge pull request #19658 from alalek:update_libwebp
...
* 3rdparty: update libwebp 1.1.0 => 1.2.0
- https://github.com/webmproject/libwebp/releases/tag/v1.2.0
* 3rdparty(libwebp): re-apply OpenCV patches
2021-03-02 12:14:56 +00:00
Alexander Alekhin
51fd26b19b
3rdparty: update openjpeg 2.3.1 => 2.4.0
...
- https://github.com/uclouvain/openjpeg/releases/tag/v2.4.0
2021-03-01 23:56:13 +00:00
Alexander Alekhin
eab8ac9a71
3rdparty: update libtiff 4.1.0 => 4.2.0
...
- https://gitlab.com/libtiff/libtiff/-/tags/v4.2.0
2021-03-01 23:19:00 +00:00
Alexander Alekhin
0a6f216f83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-21 20:14:09 +00:00
Dan Ben-Yosef
f0445295bd
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
2021-02-15 19:58:37 +00:00
Maksim Shabunin
694fe3e7d2
core, gapi: supported build with oneTBB 2021
2021-01-29 02:38:05 +03:00
Alexander Alekhin
dd1494eebf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-11 19:27:20 +00:00
Alexander Alekhin
32377ce57d
android: add -llog for libprotobuf
2020-12-10 20:00:58 +00:00
Alexander Alekhin
5c987e4c75
Merge pull request #18924 from alalek:4.x-xcode12
...
(4.x) build: Xcode 12 support
* build: xcode 12 support, cmake fixes
* ts: eliminate clang 11 warnigns
* 3rdparty: clang 11 warnings
* features2d: eliminate build warnings
* test: warnings
* gapi: warnings from 18928
2020-11-26 22:56:59 +00:00
Alexander Alekhin
ce8027c6fb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-17 21:56:26 +00:00
Alexander Alekhin
d266fee8bb
3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
...
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.6
2020-11-17 18:28:52 +00:00
Alexander Alekhin
d9a62c42e5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-28 14:41:08 +00:00
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