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
Alexander Alekhin
4001346a30
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-03 19:33:52 +00:00
Alexander Alekhin
d8b8c3b145
Merge pull request #14233 from alalek:cmake_fix_license_install
2019-04-03 19:30:47 +00:00
Alexander Alekhin
4fa4bef41d
cmake: fix licenses install rules
2019-04-02 19:24:14 +03:00
Alexander Alekhin
97548b01c7
FFmpeg: try to download wrapper with elevated privileges
2019-04-02 16:40:11 +03:00
Alexander Alekhin
10ce935823
3rdparty(zlib): prevent uninitialized use of state->check
...
backporting of commit: 8afb2f0cb7
2019-03-30 20:26:49 +00:00
Alexander Alekhin
8afb2f0cb7
3rdparty(zlib): prevent uninitialized use of state->check
...
ozz-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13317
PR: https://github.com/opencv/opencv/pull/14193
zlib upstream bug: madler/zlib#245
Ported fix: ee376c65ab
2019-03-30 18:46:10 +00:00
Alexander Alekhin
90df5e00b4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-26 18:56:54 +00:00
iPanda
097fc1a271
Merge pull request #13972 from Mainvooid:add_cuda_support_for_D3D11_interop
...
* Add CUDA support for D3D11 interop. #13888
color_detail.hpp: fixed build error : dynamic initialization is not supported for a __constant__ variable.
directx.cpp: Add CUDA support(cl_nv_d3d11_sharing) for D3D11 interop. #13888
Update directx.cpp
Format adjustment.
Update directx.cpp
fix error.
Update directx.cpp
Format adjustment
Update directx.cpp
fix trailing whitespace.
fix format errors
convert indentation to spaces .
Trim trailing whitespace.
Add information about source of cl_d3d11_ext.h
Avoid unrelated changes.
Increase compile-time conditional judgment.
Increase the judgment of whether the OCL device has the required extensions at compile time.
Add compilation option `HAVE_CLNVEXT`.Check CL support in runtime.
Check result of `clGetExtensionFunctionAddressForPlatform` for KHR is invalid.It always can get the address(from OpenCL.dll),So I check NV support(from nvopencl64.dll) before KHR when `HAVE_CLNVEXT` is enabled.
Delete cl_d3d11_ext.h
Modified parameter list
fix "cannot open include file: 'CL/cl_d3d11_ext.h'"
remove not referenced var
fix C2143: syntax error
Improve compile-time judgment.
dlrectx.cpp Modify the detection order.
initializeContextFromD3D11Device:
```
// try with NV(Need to check it first)
// try with KHR
```
fix warnig C4100
Revert "fix warnig C4100"
This reverts commit 76e5becb67780071d0cbde61cc4f5f807ad7c5ac.
fix warning C4100
fix warning C4505
Format alignment
Format adjustment and automatically detect header files.
Automatically detect header files when users are not configured or configuration errors occur.
avoid unrelated changes.
Update .cmake
Update .cmake
* fix build errors
* fix warning:defined but not used
* Revert "fix warning:defined but not used"
This reverts commit 7ab3537cd0
.
* fix warning:defined but not used
* fix build error for mac
* fix build error for win
* optimizing branch judgment
* Revert "optimizing branch judgment"
This reverts commit 88b72b870e
.
* fix warning C4702: unreachable code
* remove unused code
* Fix problems that may lead to undefined behavior
* Add status check
* fix error C2664,C2665 : cannot convert argument
* Format adjustment
VSCODE will automatically format the indentation to 4 spaces in some situation.
* fix error C2440
* fix error C2440
* add cl_d3d11_ext.h
* Format adjustment
* remove unnecessary checks
2019-03-24 18:34:09 +03:00
Alexander Alekhin
26087e28ad
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-15 22:42:57 +00:00
Alexander Alekhin
40dd96e83a
3rdparty: fix libtiff build
...
Keep `_FILE_OFFSET_BITS` undefined in Android builds.
2019-03-14 19:35:02 +00:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Alexander Alekhin
d5a3ad5b64
3rdparty: update libjpeg-turbo/CMakeLists.txt
2019-02-26 12:30:46 +03:00
Juha Reunanen
30cf5e0164
Update libjpeg-turbo from 1.5.3 to 2.0.2
2019-02-26 12:30:46 +03:00
Alexander Alekhin
8bde6aea4b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-19 19:49:13 +00:00
Alexander Alekhin
bd00471a89
Merge pull request #13808 from tailsu:sd/libtiff-4.0.10
2019-02-14 09:36:10 +00:00
Stefan Dragnev
ff1ec6ccc6
update to libtiff-4.0.10
2019-02-14 09:28:14 +01:00
Stefan Dragnev
094615b2c5
update libpng to 1.6.36
...
* re-enabled NEON routines for arm64
2019-02-13 14:54:18 +01:00
Alexander Alekhin
40959fcc61
Merge pull request #13637 from berak:fix_openvx
2019-01-18 14:56:31 +00:00
berak
53c2ebf7f6
fix openvx wrappers
2019-01-16 12:10:22 +01:00
Alexander Alekhin
7e2ebecd52
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-01-10 12:29:41 +03:00
Thomas Peters
e8ac3ea9ea
fix implicit fallthrough warning.
2019-01-08 09:49:45 -05:00
Alexander Alekhin
cbf80117af
eliminate build warnings
2018-12-19 15:42:38 +03:00
Maksim Shabunin
26cb154f40
Fixed NEON detection in Carotene build
2018-11-26 11:33:18 +03:00
Maksim Shabunin
fb6929ac3d
Fixed NEON detection in Carotene build
2018-11-26 11:30:20 +03:00
Alexander Alekhin
bea312bd65
Merge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray
2018-11-16 23:35:51 +03:00
Tomoaki Teshima
3bbc4e44c3
fix test failure of ColorCvtRGB2Gray
...
- update parameter in carotene
2018-11-16 23:31:01 +09:00
Alexander Alekhin
d4f038dfcc
ffmpeg: update 4.1 (OpenCV 4.x branch)
...
ffmpeg 4.0.2 -> 4.1
2018-11-07 15:15:04 +03:00
Alexander Alekhin
2007e1d8a3
ffmpeg: update 3.4.5 (OpenCV 3.4 branch)
...
ffmpeg 3.4.2 -> 3.4.5
2018-11-03 03:10:10 +00:00
Alexander Alekhin
687fa6a8ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-02 05:33:35 +00:00
Alexander Alekhin
8cb8ba7caf
3rdparty: update libpng 1.6.35
...
http://www.libpng.org/pub/png/libpng.html
2018-10-30 19:03:14 +03:00
WuZhiwen
6e3ea8b49d
Merge pull request #12703 from wzw-intel:vkcom
...
* dnn: Add a Vulkan based backend
This commit adds a new backend "DNN_BACKEND_VKCOM" and a
new target "DNN_TARGET_VULKAN". VKCOM means vulkan based
computation library.
This backend uses Vulkan API and SPIR-V shaders to do
the inference computation for layers. The layer types
that implemented in DNN_BACKEND_VKCOM include:
Conv, Concat, ReLU, LRN, PriorBox, Softmax, MaxPooling,
AvePooling, Permute
This is just a beginning work for Vulkan in OpenCV DNN,
more layer types will be supported and performance
tuning is on the way.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/vulkan: Add FindVulkan.cmake to detect Vulkan SDK
In order to build dnn with Vulkan support, need installing
Vulkan SDK and setting environment variable "VULKAN_SDK" and
add "-DWITH_VULKAN=ON" to cmake command.
You can download Vulkan SDK from:
https://vulkan.lunarg.com/sdk/home#linux
For how to install, see
https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html
https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html
respectively for linux, windows and mac.
To run the vulkan backend, also need installing mesa driver.
On Ubuntu, use this command 'sudo apt-get install mesa-vulkan-drivers'
To test, use command '$BUILD_DIR/bin/opencv_test_dnn --gtest_filter=*VkCom*'
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: dynamically load Vulkan runtime
No compile-time dependency on Vulkan library.
If Vulkan runtime is unavailable, fallback to CPU path.
Use environment "OPENCL_VULKAN_RUNTIME" to specify path to your
own vulkan runtime library.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
* dnn/Vulkan: Add a python script to compile GLSL shaders to SPIR-V shaders
The SPIR-V shaders are in format of text-based 32-bit hexadecimal
numbers, and inserted into .cpp files as unsigned int32 array.
* dnn/Vulkan: Put Vulkan headers into 3rdparty directory and some other fixes
Vulkan header files are copied from
https://github.com/KhronosGroup/Vulkan-Docs/tree/master/include/vulkan
to 3rdparty/include
Fix the Copyright declaration issue.
Refine OpenCVDetectVulkan.cmake
* dnn/Vulkan: Add vulkan backend tests into existing ones.
Also fixed some test failures.
- Don't use bool variable as uniform for shader
- Fix dispathed group number beyond max issue
- Bypass "group > 1" convolution. This should be support in future.
* dnn/Vulkan: Fix multiple initialization in one thread.
2018-10-29 17:51:26 +03:00
Alexander Alekhin
50bec53afc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-26 17:56:55 +03:00
maver1
e397434cb6
Merge pull request #12877 from maver1:3.4
...
* Updated ICV packages and IPP integration
* core(test): minMaxIdx IPP regression test
* core(ipp): workaround minMaxIdx problem
* core(ipp): workaround meanStdDev() CV_32FC3 buffer overrun
* Returned semicolon after CV_INSTRUMENT_REGION_IPP()
2018-10-24 15:02:53 +03:00
Alexander Alekhin
fd832bb57d
core: follow IEEE 754 rules for floating-point division
2018-10-14 10:47:50 +00:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Maksim Shabunin
09ef4c9cff
FFmpeg: correct licenses install location
2018-10-05 17:10:42 +03:00
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00
Loic Devulder
ac9ec55b37
3rdparty/protobuf: fix compilation issue on s390
...
This commit fixes an issue while trying to compile
on s390x architecture.
This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955
2018-09-30 21:33:34 +02:00
Alexander Alekhin
8b661cde15
ffmpeg: update 4.0 (master)
...
- ffmpeg 4.0.2
- openh264 1.8.0
2018-09-17 21:36:52 +00:00
CJ Smith
da41ac9e60
Merge pull request #12106 from CJSmith-0141:warpPerspective_typofix
...
* Fixes typo in function name hal::warpPerspective.
* Fixes remaining typos in word Perspective (was Perspectve).
2018-08-01 14:41:20 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Alexander Alekhin
d5951bc033
build: eliminate GCC8 warnings
2018-07-16 17:24:12 +03:00
Alexander Alekhin
b39cd06249
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-25 22:03:17 +03:00
Alexander Alekhin
8b5e29c234
Merge pull request #11808 from tomoaki0705:caroteneSuppressWarnings
2018-06-23 08:46:29 +00:00
Tomoaki Teshima
e324d2e534
suppress warning on Arm platform
2018-06-22 20:17:22 +09:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Alexander Alekhin
8221f57c26
Merge pull request #11729 from alalek:ffmpeg_update_3.4
2018-06-09 12:25:23 +00:00
Alexander Alekhin
390f0a5dcd
cmake: generate and install ffmpeg-download.ps1
...
64-bit only
2018-06-09 13:19:48 +03:00
Alexander Alekhin
d3696f3ad2
ffmpeg: update OpenCV FFmpeg wrapper (3.4)
2018-06-08 18:47:00 +03:00
Peter Rekdal Sunde
9492f46d77
3rdparty: update libwebp 0.6.1 => 1.0.0
...
Commit: 698b8844e3
Tag: https://github.com/webmproject/libwebp/releases/tag/v1.0.0
2018-06-05 13:17:20 +03:00
Pavel Vlasov
eaf70c7bb3
Hotfix packages with several fixes in IW code including:
...
__STDCALL macro change to support IPP 2018u3+ external packages
Memory leak fix in Gaussian filter
Improved checkers for OpenMP supported features
Improved declarations for atomic operations.
ICV binary and package version are the same.
2018-05-18 12:52:27 +03:00
Alexander Alekhin
f3e166c58b
Merge pull request #11528 from tomoaki0705:fixTabSpaceLibTiff
2018-05-16 12:15:39 +00:00
Tomoaki Teshima
85668cf5a4
remove Tab
2018-05-16 18:56:23 +09:00
Alexander Alekhin
f8252702a8
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
2018-05-11 18:29:57 +03:00
Alexander Alekhin
777953923e
3rdparty: added libjpeg-turbo source code (1.5.3)
...
Repo: https://github.com/libjpeg-turbo/libjpeg-turbo.git
Tag: 1.5.3
excluded libjpeg-turbo files:
- bmp.c
- bmp.h
- cderror.h
- cdjpeg.c
- cdjpeg.h
- cjpeg.c
- djpeg.c
- example.c
- jcstest.c
- jdatadst-tj.c
- jdatasrc-tj.c
- jpegtran.c
- rdbmp.c
- rdcolmap.c
- rdgif.c
- rdjpgcom.c
- rdppm.c
- rdrle.c
- rdswitch.c
- rdtarga.c
- tjbench.c
- tjunittest.c
- tjutil.c
- tjutil.h
- transupp.c
- transupp.h
- turbojpeg-jni.c
- turbojpeg.c
- turbojpeg.h
- wrbmp.c
- wrgif.c
- wrjpgcom.c
- wrppm.c
- wrrle.c
- wrtarga.c
2018-05-11 17:43:50 +03:00
Dmitry Kurtaev
4ec456f0a0
Custom layers for deep learning networks ( #11129 )
...
* Custom deep learning layers support
* Stack custom deep learning layers
2018-04-24 14:59:59 +03:00
Alexander Alekhin
c8b515ea69
Merge pull request #11315 from tomoaki0705:featureComparePixelCount
2018-04-20 14:50:40 +00:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Tomoaki Teshima
98d9369a38
add new comparison to tolerate with rounding error
...
* restore resize of carotene
* clean up the source code
* remove unused member function (Near)
* add strict test on the border
2018-04-19 17:31:42 +09:00
Alexander Alekhin
784c8436fd
cmake: update PDB installation
2018-04-09 18:50:58 +03:00
Alexander Alekhin
87498bc6d4
cmake: workaround CPATH ipp_iw issue
...
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
2018-03-28 18:43:28 +03:00
Alexander Alekhin
0587f92d96
cmake: disable override warnings in 3rdparty code and viz
2018-03-28 17:57:59 +03:00
Alexander Alekhin
6bd80ba71b
cmake: use SYSTEM include directories
2018-03-28 17:57:58 +03:00
Alexander Alekhin
08941b7890
cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
...
- Recommended compiler checks:
- GCC: CV_GCC
- Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Tomoaki Teshima
06babf90a5
let the test OCL_ImgprocWarp/Resize.Mat pass on ARM/Aarch64
...
* disable carotenete when calling resize on ARM/Aarch64
* loosen eps on Aarch64
2018-03-22 21:35:34 +09:00
Maksim Shabunin
7bbe002a2f
Add install component for 3rdparty libraries licenses
2018-03-06 16:32:30 +03:00
Alexander Alekhin
586625f8ba
3rdparty: fix protobuf version in README file
2018-02-27 15:48:19 +03:00
Alexander Alekhin
f7aa2e0d44
ffmpeg: update wrapper
...
FFmpeg: 3.3.4 -> 3.4.2
LibVPX: 1.6.1 -> 1.7.0
OpenH264: 1.6.0 -> 1.7.0
2018-02-22 15:04:06 +03:00
Maksim Shabunin
e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
Dmitry Kurtaev
ec8d39d059
Re-apply protobuf fix for JavaScript builds
...
original commit: f503515082
JavaScript bindings for dnn module
2018-01-17 20:20:00 +00:00
Maksim Shabunin
8b87c4b96a
Fixed several warnings produced by clang 6 and static analyzers
2018-01-16 15:26:28 +03:00
Alexander Alekhin
22816a4c43
protobuf: drop unused files
2018-01-15 21:15:23 +00:00
Alexander Alekhin
4d84999452
dnn: protobuf build warnings
2018-01-15 21:15:23 +00:00
oqtvs
df0b83332d
Updated protobuf version to 3.5.1
2018-01-15 13:51:37 -02:00
Alexander Alekhin
c608c232a2
3rdparty(libtiff): fix build with Android NDK 16
...
Compiler message:
tif_unix.c:170:12: error: call to 'mmap' declared with attribute error:
mmap is not available with _FILE_OFFSET_BITS=64 when using GCC until android-21.
Either raise your minSdkVersion, disable _FILE_OFFSET_BITS=64, or switch to Clang.
2018-01-05 04:52:17 +00:00
Alexander Alekhin
b76a691bcf
3rdparty(protobuf): fix build with Android NDK 16
2018-01-05 04:52:17 +00:00
Alexander Alekhin
05b259fe2e
Merge pull request #10344 from tomoaki0705:fixBuildLibtiff
2017-12-18 17:00:45 +00:00
Tomoaki Teshima
c057d29192
fix compilation error on Visual Studio 2013 and earlier
...
- fix compilation error about "inline"
- fix linker error about "_TIFF_snprintf_f"
2017-12-18 21:51:33 +09:00
Vadim Pisarevsky
e29de5dd2b
Merge pull request #10343 from tomoaki0705:suppressWarningEncoding
2017-12-18 10:53:24 +00:00
Tomoaki Teshima
65f502bc99
suppress warning on Visual Studio
...
* remove non ASCII character from the comment
2017-12-18 15:32:06 +09:00
Alexander Alekhin
8ed1a274e1
cmake: fix missed include in libtiff
2017-12-15 23:28:09 +03:00
Alexander Alekhin
50365b7741
cmake: update CMAKE_POSITION_INDEPENDENT_CODE
2017-12-15 15:56:19 +03:00
Sayed Adel
a8ae9cab08
3rdparty:libpng[1.6.34] Add missing support for PowerPC/VSX
2017-12-15 03:00:07 +00:00
Alexander Alekhin
cd4176104d
3rdparty: update libwebp 0.6.1
2017-12-14 14:49:31 +03:00
Alexander Alekhin
5c709f4aaa
3rdparty: update libtiff 4.0.9
2017-12-14 14:49:31 +03:00
Alexander Alekhin
ae5e1f8ece
3rdparty: eliminate jasper build warning
2017-12-14 14:49:31 +03:00
Suleyman TURKMEN
83b5b86f7d
3rdparty: update libjpeg 9b
2017-12-14 14:49:31 +03:00
Alexander Alekhin
ca46171246
3rdparty: libpng patch
2017-12-14 14:49:31 +03:00
Suleyman TURKMEN
d4e2e6279c
3rdparty: update libpng 1.6.34
2017-12-14 14:49:30 +03:00
Suleyman TURKMEN
197078e331
3rdparty: update zlib 1.2.11
2017-12-14 14:49:30 +03:00
Alexander Alekhin
0fcc6f5d60
Merge pull request #10282 from alalek:cmake_tbb_version
2017-12-13 13:50:24 +00:00
Vitaly Tuzov
51cb56ef2c
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. ( #9468 )
2017-12-13 15:00:38 +03:00
Alexander Alekhin
8d4777c81d
cmake: generate tbb version file
2017-12-12 16:12:32 +03:00
Dmitry Kurtaev
f503515082
JavaScript bindings for dnn module
2017-12-08 18:33:48 +03:00
Alexander Alekhin
f7913e2c84
build: eliminate Xcode 9.1 warnings
...
- 3rdparty/libjasper/jas_getopt.c:129:25: warning: this function declaration is not a prototype [-Wstrict-prototypes]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument]
2017-11-28 17:48:40 +03:00
Maksim Shabunin
184daa155f
Fixed minor issues reported by GCC 7.2
2017-11-03 18:06:39 +03:00
Maksim Shabunin
223830a5ee
Updated TBB package to 2018.1
2017-10-20 12:16:06 +03:00
Alexander Alekhin
face2ea612
3rdparty: suppress warnings
2017-10-18 13:08:01 +03:00
Maksim Shabunin
556768ead1
Merge pull request #9805 from alalek:ffmpeg_update
2017-10-10 09:02:02 +00:00
Maksim Shabunin
ef332dc550
Fixed and suppressed warnings produced by GCC 6.3.0
2017-10-09 13:52:07 +03:00
Alexander Alekhin
cb5bc1832b
ffmpeg: update 3.3.4
2017-10-09 13:42:09 +03:00
Khem Raj
2c7a123ed8
Do not enable asm with clang
...
clang pretends to be gcc 4.2.0 which means we will
use inline asm for no reason, instead of builtins
on clang when possible.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2017-09-19 18:09:30 -07:00
Maksim Shabunin
248e2c7d47
Fixed some issues found by static analysis
2017-09-08 12:22:12 +03:00
Alexander Alekhin
9c14a2f0aa
Merge pull request #9395 from lupustr3:pvlasov/icv2017u3_update
2017-08-24 11:48:53 +00:00
Alexander Alekhin
97aaaf50b8
carotene: removed unnecessary 'register' specifier
2017-08-23 18:57:00 +03:00
Alexander Alekhin
c5f2170ce8
carotene: don't use __asm__ with aarch64
2017-08-23 18:56:53 +03:00
Pavel Vlasov
a57718e1ac
ICV2017u3 package update;
...
- Optimizations set change. Now IPP integrations will provide code for SSE42, AVX2 and AVX512 (SKX) CPUs only. For HW below SSE42 IPP code is disabled.
- Performance regressions fixes for IPP code paths;
- cv::boxFilter integration improvement;
- cv::filter2D integration improvement;
2017-08-23 14:24:43 +03:00
Alexander Alekhin
f694192878
cmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)
...
- '-fvisibility' flag was updated
- PVAPI library detection was changed
2017-08-21 18:06:40 +03:00
Alexander Alekhin
7f1114d935
cmake: disable HAVE_POSIX_SEMAPHORES on Apple platform
2017-08-14 17:19:51 +03:00
Alexander Alekhin
6ff9fc67bb
build: HAVE_LIBPTHREAD, HAVE_PTHREAD(S) => HAVE_PTHREAD
2017-08-14 10:59:38 +03:00
Alexander Alekhin
402a77e7f7
Merge pull request #9237 from alalek:fix_winrt_build
2017-07-26 10:42:49 +00:00
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
Alexander Alekhin
e45d5446f2
cleanup unused 3rdparty files
2017-07-21 15:20:13 +03:00
Alexander Alekhin
49e1f6b161
Merge pull request #9091 from alalek:update_ffmpeg
2017-07-14 17:25:35 +00:00
Alexander Alekhin
5f4c7372c0
Merge pull request #9159 from alalek:cmake_target_rename
2017-07-14 17:19:26 +00:00
Alexander Alekhin
19c9174543
cmake: rename cpufeatures target
...
It is configurable via OPENCV_CPUFEATURES_TARGET_NAME variable
2017-07-13 19:24:10 +03:00
Alexander Alekhin
a4a47b538c
build: detect Android via '__ANDROID__' macro
...
https://sourceforge.net/p/predef/wiki/OperatingSystems
2017-07-10 12:43:59 +03:00
Alexander Alekhin
359bd21bd7
ffmpeg: update 3.3.2
...
- ffmpeg 3.3 -> 3.3.2
- added VERSIONINFO
2017-07-04 18:49:30 +03:00
Tony Lian
c8783f3e23
Merge pull request #9075 from TonyLianLong:master
...
Remove unnecessary Non-ASCII characters from source code (#9075 )
* Remove unnecessary Non-ASCII characters from source code
Remove unnecessary Non-ASCII characters and replace them with ASCII
characters
* Remove dashes in the @param statement
Remove dashes and place single space in the @param statement to keep
coding style
* misc: more fixes for non-ASCII symbols
* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Alexander Alekhin
07aff8e85f
3rdparty: add ittnotify sources
...
https://github.com/01org/IntelSEAPI/tree/master/ittnotify
2017-06-26 17:05:06 +03:00
Vadim Pisarevsky
ef692350e0
Merge pull request #8966 from alalek:protobuf_sources
2017-06-26 10:27:40 +00:00
Vadim Pisarevsky
fa7e7e0ff9
Merge pull request #8900 from alalek:update_android_build
2017-06-23 10:58:53 +00:00
Alexander Alekhin
1c4c58d1b5
3rdparty: update CMake scripts for protobuf
2017-06-22 17:44:53 +03:00
Alexander Alekhin
63b30554ad
3rdparty: protobuf 3.1.0 sources
...
without tests, testdata, .proto files
2017-06-22 16:39:18 +03:00
Maksim Shabunin
5770b961a1
Fix possible uninitialized memory in libtiff
2017-06-22 14:04:30 +03:00
Alexander Alekhin
3e3e2dd512
android: make optional "cpufeatures", build fixes for NDK r15
2017-06-21 13:34:19 +03:00
Vadim Pisarevsky
12a1c127a9
Merge pull request #8890 from alalek:remove_3rdparty_jinja2_sources
2017-06-14 07:30:14 +00:00
Alexander Alekhin
a3189e36c0
Merge pull request #8753 from RyuheiMori:fix-cpu-feature-detection-on-android
2017-06-12 16:08:08 +00:00
Alexander Alekhin
f0c2da32f2
3rdparty: cpufeatures workaround
2017-06-11 05:06:49 +00:00
Alexander Alekhin
3dee87b697
update CPU detection on ANDROID patch
2017-06-11 05:06:49 +00:00
Alexander Alekhin
60f3ca458a
3rdparty: remove jinja2 source code
...
It used for Matlab binding only
2017-06-11 05:18:15 +03:00
Maksim Shabunin
a426a65b41
TBB: fix build on ARM
2017-06-05 16:36:14 +03:00
Vadim Pisarevsky
ee257ffe9e
Merge pull request #8455 from terfendail:ovxhal_skipsmall
2017-05-26 12:10:18 +00:00
Ryuhei Mori
bb3a416320
Fix cpu features detection on android
2017-05-19 21:19:13 +08:00
Vadim Pisarevsky
5950431e73
Merge pull request #8602 from alalek:ffmpeg_update
2017-05-03 13:01:55 +00:00
Pavel Vlasov
11c2ffaf1c
Update for IPP for OpenCV 2017u2 integration;
...
Updated integrations for:
cv::split
cv::merge
cv::insertChannel
cv::extractChannel
cv::Mat::convertTo - now with scaled conversions support
cv::LUT - disabled due to performance issues
Mat::copyTo
Mat::setTo
cv::flip
cv::copyMakeBorder - currently disabled
cv::polarToCart
cv::pow - ipp pow function was removed due to performance issues
cv::hal::magnitude32f/64f - disabled for <= SSE42, poor performance
cv::countNonZero
cv::minMaxIdx
cv::norm
cv::canny - new integration. Disabled for threaded;
cv::cornerHarris
cv::boxFilter
cv::bilateralFilter
cv::integral
2017-04-25 15:53:12 +03:00
Alexander Alekhin
f1c8094f5f
Merge pull request #8575 from lupustr3:pvlasov/icv2017u2_initial_update
2017-04-21 10:55:29 +00:00
Pavel Vlasov
35c7216846
IPP for OpenCV 2017u2 initial enabling patch;
2017-04-20 20:26:30 +03:00
Alexander Alekhin
a8a1838615
update FFmpeg Windows wrapper
...
ffmpeg 3.2.1 -> 3.3
libvpx 1.6.0 -> 1.6.1
2017-04-18 22:12:34 +03:00
Vitaly Tuzov
9dc36a1ece
Tuned restrictions for Canny, Warp, FAST, Accumulate and Convolution OpenVX HAL calls on small images
2017-04-14 13:20:25 +03:00
Vitaly Tuzov
d873fe66ab
Fixed size estimation for copyFrom/To vector in vx_matrix and vx_convolution wrappers
2017-04-13 17:45:42 +03:00
Vitaly Tuzov
4c0d833dec
Disabled vxuConvolution call for sepFilter evaluation
2017-04-11 15:57:20 +03:00
Vitaly Tuzov
0f1a56da7c
Changed restrictions for OpenVX HAL calls on small images
2017-04-09 01:17:57 +03:00
Vitaly Tuzov
bf62dca45a
Extended restrictions for OpenVX HAL calls on small images
2017-04-06 18:17:34 +03:00
Vitaly Tuzov
bf5b7843e8
Extended set of OpenVX HAL calls disabled for small images
2017-04-06 18:17:32 +03:00
Vitaly Tuzov
62fab57c3e
Tune OpenVX HAL usability checks to distinguish multiplication and color conversion kernels
2017-04-06 18:17:30 +03:00
Vitaly Tuzov
9620cb550d
Calls to OpenVX HAL disabled for images less than FullHD
2017-04-06 18:17:28 +03:00
Alexander Alekhin
a7de4aca6a
cmake: update ocv_download
...
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
2017-03-30 19:36:33 +00:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Vitaly Tuzov
c5eb3dfecb
Restricted OpenVX HAL separable filter implementation to 3x3 kernel size
2017-03-23 20:23:56 +03:00
Vitaly Tuzov
5ebf066dd5
Updated OpenVX detector and wrappers to handle Reference attribute names change
2017-03-22 16:50:38 +03:00
Vadim Pisarevsky
d00561d396
Merge pull request #8217 from terfendail:ovx_halheader
2017-03-02 11:17:54 +00:00
Vitaly Tuzov
61404dd2ac
imgproc HAL header inclusion moved
2017-02-27 10:56:33 +03:00
Vitaly Tuzov
9a4b5a4545
OpenVX calls updated to use single common OpenVX context per thread
2017-02-21 16:08:23 +03:00
Alexander Alekhin
1304ad1e12
Merge pull request #8160 from ilijapuaca:master
2017-02-14 13:03:09 +00:00
Alexander Alekhin
28f9ce4e33
cmake: cleanup MSVC checks
2017-02-10 15:29:12 +03:00
Ilija Puaca
1b842c4762
Updated version of libwebp to 0.6.0. Removed iOS from build exceptions for libwebp
2017-02-09 23:35:27 +01:00
Vitaly Tuzov
b6561ce57d
Fixed addressing structure population for integral image output
2017-02-03 13:54:22 +03:00
Vitaly Tuzov
be7d060ea4
Merge pull request #7802 from terfendail:ovxhal_wrappers_migration
...
* OpenVX HAL updated to use generic OpenVX wrappers
* vxErr class from OpenVX HAL replaced with ivx::WrapperError
* reduced usage of vxImage class from OpenVX HAL replaced with ivx::Image
* vxImage class rewritten as ivx::Image subclass that calls swapHandle prior release
* Fix OpenVX HAL build
* Fix for review comments
2016-12-21 15:19:06 +02:00
apavlenko
2312131e27
moving HAL-related CMakeLists.txt to 'hal' sub-dir
2016-12-19 17:30:19 +03:00
apavlenko
bbfbdd9da1
moving hal to a separate folder
2016-12-19 17:30:19 +03:00
Alexander Alekhin
c9237a6f48
cmake: unpack IPPICV into binary directory
2016-12-16 18:43:54 +03:00
Alexander Alekhin
9c7088d95f
Merge pull request #7851 from terfendail:ovx_imagespace
2016-12-16 10:37:04 +00:00
Alexander Alekhin
a615d79f2d
Merge pull request #7768 from terfendail:ovx_remap
2016-12-16 10:33:58 +00:00
Rostislav Vasilikhin
45d3286168
wrappers for vx_pyramid added
2016-12-15 15:00:26 +03:00
Alexander Alekhin
5592142511
Merge pull request #7831 from terfendail:ovx_array_update
2016-12-14 14:08:47 +00:00
Vitaly Tuzov
f8b4d28745
Added OpenVX based processing to remap
2016-12-14 16:53:04 +03:00
Vitaly Tuzov
138f0cbf3c
Added wrapper for IMAGE_SPACE attribute setter
2016-12-14 15:40:50 +03:00
Vitaly Tuzov
2c89b39eee
Added OpenVX based processing to calcHist
2016-12-13 18:33:02 +03:00
Vitaly Tuzov
c447e5f615
Added vxTruncateArray wrapper to ivx::Array
2016-12-09 17:48:06 +03:00
apavlenko
1e2ddc30b1
Canny via OpenVX, Node wrapper extended (query/set attribute), some naming fixes
2016-12-09 14:53:06 +03:00
Alexander Alekhin
5cc2d7ad7c
Merge pull request #7771 from alalek:ffmpeg_update
2016-12-08 15:22:00 +00:00
Rostislav Vasilikhin
cb46946d34
Merge pull request #7782 from savuor:fix/ivx_types
...
Several fixes for OpenVX wrappers (#7782 )
* Several fixes added to ivx.hpp:
* `#include <VX/vxu.h>`
* `vx_keypoint_t` support added
* type check fixed
* fixed Node::create() for >6 args in c++98
* fixed Array::copyFrom() if array is empty
* type check changed; Array::addItem methods changed
2016-12-06 18:08:33 +02:00
Vadim Pisarevsky
b87cee8b9a
Merge pull request #7454 from terfendail:ovxhal_integral
2016-12-02 15:25:02 +00:00
Vadim Pisarevsky
537db2d53f
Merge pull request #7598 from terfendail:ovx_lut
2016-12-02 15:22:06 +00:00
Alexander Alekhin
39ca6a0137
ffmpeg: update Windows binaries
...
Versions:
- ffmpeg 3.2.1 (was 3.1.3)
- openh264 1.6.0 (was 1.5.0)
- libvpx 1.6.0 (was 1.5.0)
2016-12-02 15:47:15 +03:00
Vitaly Tuzov
ced81f72bc
Added OpenVX based processing to LUT
2016-12-02 14:36:47 +03:00
Alexander Alekhin
49194023b5
ffmpeg: remove compatibility glue code
2016-12-02 14:18:40 +03:00
mshabunin
2e8b9b1891
Fixed TBB build on Android armeabi
2016-12-02 12:24:42 +03:00
Alexander Alekhin
3ae1990727
Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup
2016-12-01 20:24:05 +00:00
Vadim Pisarevsky
b0d2217c65
Merge pull request #7515 from terfendail:ovxhal_graytobgr
2016-12-01 17:56:51 +00:00
Vadim Pisarevsky
e623e710be
Merge pull request #7597 from terfendail:ovx_threshold
2016-12-01 17:53:38 +00:00
Vadim Pisarevsky
ddc5155a85
Merge pull request #7677 from terfendail:ovx_minmaxloc
2016-12-01 17:42:18 +00:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Vadim Pisarevsky
817a17b218
Merge pull request #7767 from mshabunin:icl-support
2016-12-01 16:30:42 +00:00
Maksim Shabunin
19959cbfc9
Fixed Intel C++ 17 build in VS2015
2016-12-01 18:02:50 +03:00
mshabunin
695c518384
Updated TBB search script and code checks
2016-12-01 16:58:38 +03:00
Vitaly Tuzov
179a6e0cca
OpenVX wrappers linkage fix
2016-11-30 11:25:45 +03:00
Vitaly Tuzov
78b80b6abd
Added wrappers for OpenVX context attributes and setter for convolution scale attribute ( #7732 )
2016-11-29 09:34:46 -07:00
Vitaly Tuzov
0cd3788624
Added OpenVX based processing to threshold
2016-11-29 15:35:52 +03:00
Vitaly Tuzov
e9cc0f6a4c
Added OpenVX based processing to minMaxLoc
2016-11-29 15:33:48 +03:00
Vitaly Tuzov
ff2747dff5
Added wrappers for OpenVX context attributes and setter for convolution scale attribute
2016-11-28 13:02:36 +03:00
Vitaly Tuzov
8098e5b045
Added OpenVX based implementation for Gray2BGR conversion HAL API
2016-11-25 20:59:20 +03:00
apavlenko
f5f91ed7f6
eliminating conflict with ivx.hpp
2016-11-24 18:48:51 +03:00
Vitaly Tuzov
12e0bc0fe7
Added wrappers for vx_matrix and vx_convolution ( #7651 )
2016-11-24 15:02:12 +03:00
apavlenko
1c9262dce4
hiding silly warnings
2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin
fa8add8686
compilation fixed for C++98
2016-11-22 16:49:46 +03:00
Andrey Pavlenko
bfecea489e
warnings in ivx.hpp fixed
...
* fixing 1.0.1
* fixing build without c++11
* hiding warnings
2016-11-22 16:49:46 +03:00
Andrey Pavlenko
289d879d48
build fixes for openvx-1.0.1 and c++03
...
* fixing 1.0.1
* fixing build without c++11
2016-11-22 16:49:46 +03:00
apavlenko
e8d2aad978
sugar for single plane images
2016-11-22 16:49:46 +03:00
Rostislav Vasilikhin
9032a7ab81
minor fixes in samples and ivx.hpp
2016-11-22 16:49:46 +03:00
Vadim Pisarevsky
81fc6b3fde
Merge pull request #7621 from terfendail:ovxhal_resizefix
2016-11-22 13:39:20 +00:00
Alexander Alekhin
30cdcfa554
warnings
2016-11-18 14:08:53 +03:00
Vitaly Tuzov
e6f2729c7a
Replaced magic constant in large image handling check
2016-11-16 17:55:04 +03:00
Andrey Pavlenko
1f1dc42534
Merge pull request #7681 from apavlenko:ivx-docs
...
OpenVX C++ wrappers docs (#7681 )
* adding wrapper headers to the project to see them in IDE project explorer
* readme
* doxygen: toplevel brief-s
* more doxygen
* more doxygen
2016-11-16 17:05:08 +03:00
Alexander Alekhin
ad888c80cf
Merge pull request #7643 from alalek:libpng_aarch64
2016-11-14 13:38:44 +00:00
Vitaly Tuzov
9eac0f0575
Completely disabled OpenVX based implementation of resize HAL API
2016-11-10 20:55:28 +03:00
Vitaly Tuzov
88ea9f5dd7
Fix for OpenVX based implementation of resize HAL API
2016-11-10 20:55:27 +03:00
Vitaly Tuzov
850d12ae69
Completely disabled OpenVX based implementation of warp HAL API
2016-11-10 20:55:26 +03:00
Vitaly Tuzov
cd1b324e5e
Fix for OpenVX based implementation of wrapAffine HAL API
2016-11-10 20:55:26 +03:00
Vitaly Tuzov
ca1ce5fa5c
Fix for large image handling in OpenVX based implementation of HAL API
2016-11-10 20:55:25 +03:00
Vadim Pisarevsky
67c404632a
Merge pull request #7556 from terfendail:ovxhal_101compl
2016-11-10 15:56:01 +00:00
Alexander Alekhin
a50bc7d824
cmake: fix libpng for AARCH64
2016-11-10 17:50:52 +03:00
Andrey Pavlenko
bdf661538d
Merge pull request #7550 from apavlenko:ivx
...
C++ wrappers over OpenVX 1.x API (#7550 )
* initial commit
* fixing missing swap(refcount) bug
* removing dead code
* fixinf identation
* splitting c++98 and external refcount definitions
* fixing formatToMatType
* using vector instead of initializer_list for consistency with c++98 API
* IVX_HIDE_INFO_WARNINGS
* just in case a compiler doesn't do this
* removing copy functionality from ImagePatch, Image can be used for that
* stricter type checks
2016-11-10 14:43:08 +03:00
Vitaly Tuzov
26899bb345
OpenVX 1.0.1 compliance update
2016-11-10 14:04:02 +03:00
Tomoaki Teshima
2a91453ef1
brush up divSaturate of carotene
...
* use rounding to nearest same as divSaturateQ
2016-10-23 08:51:25 +09:00