Alexander Alekhin
a97f6f8058
js: support setLogLevel() / getLogLevel() calls
2021-03-20 18:14:10 +00:00
Alexander Alekhin
b19f860384
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-13 13:02:18 +00:00
Dale Phurrough
cbe236652b
noexcept def construct Mat, UMat, Mat_, MatSize, MatStep
...
original commit: 1b0f781b7c
2021-03-12 20:26:32 +00:00
Alexander Alekhin
c5c2b6f9bf
Merge pull request #19683 from diablodale:add_defconstruct_noexcept_matumat
2021-03-11 22:02:06 +00:00
Sayed Adel
84fcc4ab9b
core:ppc64 fix the build with the newer versions of Eigen on IBM/Power
...
It also fixes the build when universal intrinsics is disabled
via `-DDCV_ENABLE_INTRINSICS=OFF`.
2021-03-09 19:20:18 +02:00
Alexander Alekhin
d643a90efa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-06 17:31:08 +00:00
Vitaly Tuzov
04a9ff88d8
Merge pull request #19622 from terfendail:ref_doc
...
* Updated cpp reference implementations for a few intrinsics to address wide universal intrinsics as well
* Updated cpp reference implementations for a few more universal intrinsics
2021-03-06 17:22:21 +00:00
Mradul Agrawal
640f188ca2
Merge pull request #19583 from theroyalpekka:patch-1
...
* Update polynom_solver.cpp
This pull request is in the response to Issue #19526 . I have fixed the problem with the cube root calculation of 2*R. The Issue was in the usage of pow function with negative values of R, but if it is calculated for only positive values of R then changing x0 according to the parity of R, the Issue is resolved. Kindly consider it, Thanks!
* add cv::cubeRoot(double)
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-03-05 13:55:52 +00:00
Alexander Smorkalov
2e429268ff
Merge pull request #19668 from asmorkalov:as/filesystem_py
...
* Add Python Bindings for getCacheDirectory function
* Added getCacheDirectory interop test with image codecs.
Co-authored-by: Sergey Slashchinin <sergei.slashchinin@xperience.ai>
2021-03-04 16:17:57 +00:00
Alexander Alekhin
a823b06fa5
pre: OpenCV 4.5.2 (version++)
2021-03-02 23:20:59 +00:00
Alexander Alekhin
a123c48d4d
pre: OpenCV 3.4.14 (version++)
2021-03-02 20:47:29 +00:00
Dale Phurrough
1b0f781b7c
noexcept def construct Mat, UMat, Mat_, MatSize, MatStep
2021-03-01 22:42:13 +01:00
Alexander Alekhin
e0265c67c6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-27 17:41:57 +00:00
Alexander Alekhin
7ffc4b57aa
Merge pull request #19535 from alalek:issue_18897
2021-02-23 22:42:51 +00:00
Alexander Alekhin
9d89edff2f
Merge pull request #19594 from alalek:hotfix_19470
2021-02-22 08:29:10 +00:00
Alexander Alekhin
599d64a405
core(parallel): fix JS build, fix OpenMP version dump
2021-02-21 22:55:01 +00:00
Alexander Alekhin
0a6f216f83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-21 20:14:09 +00:00
Alexander Alekhin
1d0334fc07
Merge pull request #19584 from diablodale:fix19573_ocl_move
2021-02-21 19:20:03 +00:00
Alexander Alekhin
309e1e2b1d
core(InputArray): replace STD_ARRAY to MATX
...
- remove duplication kind
2021-02-21 19:12:21 +00:00
Dale Phurrough
96a15434a2
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
2021-02-20 18:56:04 +01:00
Dale Phurrough
4badf640bf
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: 77e26a7db3
- handled KernelArg, Image2D
2021-02-20 16:20:25 +00:00
Dale Phurrough
77e26a7db3
add noexcept to default constructors of cv::ocl
...
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
also be noexcept
2021-02-20 14:16:47 +01:00
Maksim Shabunin
b5a4bd22fb
plugins: use RTLD_NOW instead of RTLD_LAZY
2021-02-18 14:45:08 +03:00
Liangqian
0aca3fb5af
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>
2021-02-17 17:05:08 +00:00
Alexander Alekhin
6d3502833f
core: include version.hpp in cvdef.h, fix precomp.hpp usage
2021-02-16 11:10:45 +00:00
Alexander Alekhin
cc73c36e32
core(parallel): plugins support
2021-02-15 17:07:36 +00:00
Alexander Alekhin
e5d78960c6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-12 21:34:49 +00:00
Francesco Petrogalli
6ee23c9b85
Merge pull request #19486 from fpetrogalli:dotprod_fast-3.4
...
* [hal][neon] Optimize the v_dotprod_fast intrinsics for aarch64.
On Armv8 in AArch64 execution mode, we can skip the sequence
v<op>_<ty>(vget_high_<ty>(x), vget_high_<ty>(y))
in favour of
v<op>_high_<ty>(x, y)
This has better changes for recent compilers to use less data movement
operations and better register allocation. See for example:
https://godbolt.org/z/bPq7vd
* [hal][neon] Fix build failure on armv7.
* [hal][neon] Address review comments in PR.
PR: https://github.com/opencv/opencv/pull/19486
* [hal][neon] Define macro to check for the AArch64 execution state of Armv8.
* [hal][neon] Fix macro definition for AArch64.
The fix is needed to prevent warnings when building for Armv7.
2021-02-11 13:24:09 +00:00
Alexander Alekhin
6b474c4051
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-06 00:44:11 +00:00
Alexander Alekhin
e6959055b5
core(cuda.hpp): fix GpuMatND compilation with GCC < 5
2021-02-05 22:42:56 +00:00
Namgoo Lee
7ea21c4b3c
Merge pull request #19259 from nglee:dev_gpumatnd1
...
Minimal implementation of GpuMatND
* GpuMatND - minimal implementation
* GpuMatND - createGpuMatHeader
* GpuMatND - GpuData, offset, getDevicePtr(), license
* reviews
* reviews
2021-02-05 20:30:37 +00:00
Alexander Alekhin
6ca46afa63
Merge pull request #19286 from diablodale:add-cuda-stream-constructor
2021-02-03 09:55:02 +00:00
Pavel Rojtberg
6c1a433c4c
python: also catch general c++ exceptions
...
they might be thrown from third-party code (notably Ogre in the ovis
module).
While Linux is kind enough to print them, they cause instant termination
on Windows.
Arguably, they do not origin from OpenCV itself, but still this helps
understanding what went wrong when calling an OpenCV function.
2021-02-02 21:16:01 +01:00
Alexander Alekhin
2b787eb4b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-31 17:44:15 +00:00
Alexander Alekhin
5ab4623c2a
Merge pull request #19430 from alalek:fixup_19216
2021-01-31 17:41:24 +00:00
Alexander Alekhin
cdf73f2e05
Merge pull request #19427 from alalek:issue_19426
2021-01-31 14:24:37 +00:00
Alexander Alekhin
30bef20e22
js: fix SIMD build
2021-01-31 00:12:51 +00:00
Alexander Alekhin
c5bf15e009
build: fix cv2.cpp compilation
2021-01-30 11:32:27 +00:00
Dale Phurrough
34c3f0f495
add cuda::Stream constructor with cuda flags
2021-01-28 16:14:01 +01:00
Alexander Alekhin
37c12db366
Merge pull request #19365 from alalek:parallel_api
2021-01-27 18:12:15 +00:00
Alexander Alekhin
b73bf03bfc
core: parallel backends API
...
- allow to replace parallel_for() backend
2021-01-27 14:15:33 +00:00
Alexander Alekhin
e85b41f9be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-25 22:42:13 +00:00
Vadim Levin
1d3207d7c7
feat: common fixed size sequence conversion for Python bindings
2021-01-25 08:08:38 +03:00
Alexander Alekhin
cd59516433
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-22 21:29:21 +00:00
Alexander Alekhin
6ce9bb6f7a
Merge pull request #19312 from VadimLevin:dev/vlevin/clear-msg-for-failed-overload-resolution
2021-01-18 20:14:10 +00:00
Vadim Levin
a0bdb78a99
feat: add overload resolution exception for Python bindings
2021-01-18 16:29:17 +03:00
Alexander Alekhin
d3bc563c6e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-12 18:34:33 +00:00
Vitaly Tuzov
8f653ba8de
Inlined WASM fallback intrinsics to avoid using of V_TypeTraits
2021-01-11 18:12:21 +03:00
Liangqian
e4c7fca755
Merge pull request #19098 from chargerKong:EulerAngle
...
* add to/from Euler Angles
* restruct codes
* quat: optimize implementation
* cleanup debug code
* correct spelling errors
* create QuatEnum for enum EulerAnglesType
* use for loop for test_quaternion
* drop template from isIntAngleType & add minimal error information in test_quaternion.cpp
Co-authored-by: ShanChenqi <shanchenqi@huawei.com>
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2020-12-31 10:32:12 +00:00
Alexander Alekhin
84676fefe3
Merge tag '4.5.1'
2020-12-21 20:35:51 +00:00
Alexander Alekhin
1363496c11
release: OpenCV 4.5.1
2020-12-21 20:01:38 +00:00
Alexander Alekhin
68fb8dd873
Merge tag '3.4.13'
2020-12-21 14:55:54 +00:00
Alexander Alekhin
8869dc7762
release: OpenCV 3.4.13
2020-12-20 22:15:49 +00:00
Alexander Alekhin
6659d55a9d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-20 18:40:22 +00:00
Alexander Alekhin
dd276dbb59
Merge pull request #19176 from alalek:issue_19131
2020-12-20 16:40:28 +00:00
Alexander Alekhin
3359bdc464
docs(core): fix process_video_frame() code snippet
2020-12-20 02:27:46 +00:00
Vincent Rabaud
4c75b1c102
Fix comment typos.
2020-12-19 08:22:37 +01:00
Alexander Alekhin
dac298ef41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-18 20:47:56 +00:00
Alexander Alekhin
b2ea15da35
Merge pull request #19137 from VadimLevin:dev/vlevin/safe-string-conversion
2020-12-18 11:20:50 +00:00
Alexander Alekhin
624d532000
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-17 21:05:34 +00:00
Vadim Pisarevsky
ba7dbca018
added information about the contribution & ISCAS copyright
2020-12-17 18:28:17 +08:00
Vadim Levin
7b0d7d0c9a
fix: conversion to string in python bindings
...
If provided `PyObject` can't be converted to string `TypeError` is
reported instead of `SytemError` without any message.
2020-12-16 15:11:58 +03:00
Alexander Alekhin
392991fa0b
core(opencl): add version check before clCreateFromGLTexture() call
2020-12-13 20:57:26 +00:00
Alexander Alekhin
de385009ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-09 18:09:00 +00:00
Alexander Alekhin
d2bc0e5fe0
js(wasm): use fallback on missing intrinsics in Emscripten 2.0.0+
2020-12-09 04:19:53 +00:00
Dale Phurrough
f77276311d
clarify opencl execution context doc
...
- fix opencv/opencv#18888
2020-12-08 16:08:53 +01:00
Alexander Alekhin
26e8048a0a
core: update handling of allocator stats type
...
- don't use OPENCV_ALLOCATOR_STATS_COUNTER_TYPE definition in non C++11 builds
- don't use with MinGW
2020-12-05 20:54:47 +00:00
Alexander Alekhin
6fdb7aee84
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-04 18:26:58 +00:00
Vadim Pisarevsky
b023fcd264
Merge pull request #18911 from chargerKong:quat
2020-12-02 19:14:47 +00:00
Kong Liangqian
8e32566583
Add adding and subtraction operations between a number and a quaternion;
...
fix a typo;
Add documentation of quaternion operators;
Restrict the type of scalar: the same as quaternion;
2020-12-03 01:38:15 +08:00
Alexander Alekhin
6f8120cb3a
core(UMat): drop unavailable methods
2020-12-02 15:02:43 +00:00
Vadim Pisarevsky
7d7d907de7
Merge pull request #18228 from joy2myself:rvv
2020-12-02 13:27:35 +00:00
Zhangyin
673e4e20f0
Added RISC-V backend of universal intrinsics
2020-12-02 14:25:03 +08:00
Alexander Alekhin
0105f8fa38
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-20 20:32:00 +00:00
Alexander Alekhin
049b50d9c0
Merge pull request #18858 from fegorsch:improve-persistence-doc
2020-11-20 11:12:25 +00:00
Felix Gorschlüter
c996fd1c06
Small improvements to persistence-API doc
2020-11-20 10:49:51 +03:00
chargerKong
11cfa64a10
Merge pull request #18335 from chargerKong:master
...
Ordinary quaternion
* version 1.0
* add assumeUnit;
add UnitTest;
check boundary value;
fix the func using method: func(obj);
fix 4x4;
add rodrigues vector transformation;
fix mat to quat;
* fix blank and tab
* fix blank and tab
modify test;cpp to hpp
* mainly improve comment;
add rvec2Quat;fix toRodrigues;
fix throw to CV_Error
* fix bug of quatd * int;
combine hpp and cpp;
fix << overload error in win system;
modify include in test file;
* move implementation to quaternion.ini.hpp;
change some constructor to createFrom* function;
change Rodrigues vector to rotation vector;
change the matexpr to mat of 3x3 return type;
improve comments;
* try fix log function error in win
* add enums for assumeUnit;
improve docs;
add using std::cos funcs
* remove using std::* from header;
add std::* in affine.hpp,warpers_inl.hpp;
* quat: coding style
* quat: AssumeType => QuatAssumeType
2020-11-19 16:59:33 +00:00
Alexander Alekhin
328883b6ea
Merge pull request #18675 from sturkmen72:update-documentation
2020-11-18 16:50:35 +00:00
Suleyman TURKMEN
cc7f17f011
update documentation
2020-11-18 17:07:04 +03:00
Alexander Alekhin
2687a2b6dc
pre: OpenCV 4.5.1 (version++)
2020-11-18 11:04:54 +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
9485113923
pre: OpenCV 3.4.13 (version++)
2020-11-17 21:50:30 +00:00
Alexander Alekhin
2b558a3787
core: fix F16C compilation check
2020-11-17 12:22:49 +00:00
Alexander Alekhin
1fe276d041
core: move inline code from mat.inl.hpp (OpenCV 4.x additions)
...
base commit: aac7c5465b
2020-10-26 22:58:30 +00:00
Alexander Alekhin
f345ed564a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-26 20:07:47 +00:00
Alexander Alekhin
aac7c5465b
core: move inline code from mat.inl.hpp
2020-10-21 23:06:09 +00:00
Alexander Alekhin
e8058b9fdb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-21 15:55:23 +00:00
Kun Liang
c82417697a
Merge pull request #18068 from lionkunonly:gsoc_2020_simd
...
[GSoC] OpenCV.js: WASM SIMD optimization 2.0
* gsoc_2020_simd Add perf test for filter2d
* add perf test for kernel scharr and kernel gaussianBlur
* add perf test for blur, medianBlur, erode, dilate
* fix the errors for the opencv PR robot
fix the trailing whitespace.
* add perf tests for kernel remap, warpAffine, warpPersepective, pyrDown
* fix a bug in modules/js/perf/perf_imgproc/perf_remap.js
* add function smoothBorder in helpfun.js and remove replicated function in perf test of warpAffine and warpPrespective
* fix the trailing white space issues
* add OpenCV.js loader
* Implement the Loader with help of WebAssembly Feature Detection, remove trailing whitespaces
* modify the explantion for loader in js_setup.markdown and fix bug in loader.js
2020-10-18 20:30:36 +00:00
Alexander Alekhin
b5717f82a0
core: fix __clang_major__ typo regression
2020-10-16 15:35:51 +00:00
Alexander Alekhin
78476a0fe2
Merge tag '4.5.0'
2020-10-11 21:29:42 +00:00
Alexander Alekhin
d5fd2f0155
release: OpenCV 4.5.0
2020-10-11 21:26:07 +00:00
Alexander Alekhin
7ed82aea38
Merge tag '3.4.12'
2020-10-10 20:18:09 +00:00
Alexander Alekhin
dc15187f1b
release: OpenCV 3.4.12
2020-10-10 20:14:29 +00:00
Alexander Alekhin
39d5e14c1f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-07 09:09:37 +00:00
Alexander Alekhin
d34717d8c9
core: allow to disable including of unsupported/Eigen/CXX11/Tensor
...
- define OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT
2020-10-04 15:14:46 +00:00
Alexander Alekhin
8cbd20b380
eliminate build warnings
2020-09-29 21:32:16 +00:00
Alexander Alekhin
295afd5882
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-09-28 21:33:29 +00:00
Alexander Alekhin
233030e417
core: force check for string literals are used in the message
2020-09-27 06:37:44 +00:00
Odianosen Ejale
862fc06b6f
Fixed and updated OpenCL-VA interoperability
2020-09-25 16:11:50 +03:00
Alexander Alekhin
a12ceb04bb
pre: OpenCV 4.5.0 (version++)
2020-09-08 06:08:58 +00:00
Alexander Alekhin
50ff40d684
pre: OpenCV 3.4.12 (version++)
2020-09-06 22:26:32 +00:00
Alexander Alekhin
2129c72bc0
core(OpenCL): thread-local OpenCL execution context
2020-09-02 05:04:20 +00:00
Alexander Alekhin
fa25faa2d2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-06 14:15:52 +00:00
Alexander Alekhin
422f802ec9
Merge pull request #17922 from joy2myself:build_riscv_with_c++_intrin
2020-08-04 09:45:32 +00:00
Gabriel
96ce65f021
Document PatchNANs input type
2020-08-03 22:57:18 -03:00
Zhangyin
ff4c3873f2
Added cmake toolchain for RISC-V with clang.
...
- Added cross compile cmake file for target riscv64-clang
- Extended cmake for RISC-V and added instruction checks
- Created intrin_rvv.hpp with C++ version universal intrinsics
2020-08-03 20:18:56 +08:00
Alexander Alekhin
d8b2f11cc8
Merge tag '4.4.0'
2020-07-17 23:08:18 +00:00
Alexander Alekhin
c3bb57afea
release: OpenCV 4.4.0
2020-07-17 22:43:40 +00:00
Alexander Alekhin
ffe0d50447
core(persistence): fix "use after free" bug
...
- do not store user-controlled "FileStorage" pointer
- store FileStorage::Impl pointer instead
2020-07-17 21:39:06 +00:00
Alexander Alekhin
284d26da05
Merge tag '3.4.11'
2020-07-17 02:06:19 +00:00
Alexander Alekhin
e8d4259f9a
release: OpenCV 3.4.11
2020-07-17 00:34:46 +00:00
Alexander Alekhin
8bf1b9a422
cmake(cuda): repair ccbin, re-implement execute_process() cache
...
- preventive fix for arch "11.0" (CUDA_ARCH_BIN_OR_PTX_10 bug)
- new var: OPENCV_CUDA_DETECTION_NVCC_FLAGS
- new var: OPENCV_CMAKE_CUDA_DEBUG
2020-07-08 07:34:17 +00:00
Alexander Alekhin
e0f9eac521
cmake: backport CUDA scripts
2020-07-08 07:33:54 +00:00
Alexander Alekhin
524a2fffe9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-07-06 23:05:04 +00:00
Alexander Alekhin
eb6678ebef
Merge pull request #17699 from alalek:build_core_cuda
...
* core(cuda): fix build
- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167
* cmake(cuda): backport workaround for CUDA 11
* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize
* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
2020-07-06 22:58:17 +00:00
Alexander Alekhin
a711e2aa41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-29 21:19:09 +00:00
dev-tronifier
9b727fa1f3
Increased portability of CV_Func
2020-06-26 19:45:58 +00:00
Alexander Alekhin
e3d502310f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-19 07:33:50 +00:00
Yuriy Obukh
456e88a8a4
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
2020-06-18 14:31:11 +03:00
Namgoo Lee
2043e06102
cuda optflow tvl1 : async safety
...
also modify cuda canny to use createTextureObjectPitch2D, etc.
2020-06-17 01:04:22 +09:00
Alexander Alekhin
0cbaaba4b1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-12 22:20:50 +00:00
Rasmus
781fbde449
Merge pull request #17368 from themightyoarfish:cv2eigen-doc
...
* Add documentation about usage of cv2eigen functions in eigen.hpp
* Fixed Doxygen syntax.
Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
2020-06-10 07:53:18 +00:00
Alexander Alekhin
5f3012fc9a
pre: OpenCV 4.4.0 (version++)
2020-06-09 02:27:13 +00:00
Alexander Alekhin
a43e3bebe6
pre: OpenCV 3.4.11 (version++)
2020-06-08 18:46:27 +00:00
Alexander Alekhin
7722a2b8a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-06-04 17:58:34 +00:00
Alexander Alekhin
f68654a204
Merge pull request #17438 from alalek:fix_eigen_builds
2020-06-01 18:02:07 +00:00
Vadim Pisarevsky
5489735258
Merge pull request #17436 from vpisarev:fix_python_io
...
* fixed #17044
1. fixed Python part of the tutorial about using OpenCV XML-YAML-JSON I/O functionality from C++ and Python.
2. added startWriteStruct() and endWriteStruct() methods to FileStorage
3. modifed FileStorage::write() methods to make them work well inside sequences, not only mappings.
* try to fix the doc builder
* added Python regression test for FileStorage I/O API ([TODO] iterating through long sequences can be very slow)
* fixed yaml testing
2020-06-01 11:33:09 +00:00
Alexander Alekhin
74020a084b
core: fix builds with eigen helper header
2020-05-31 15:41:42 +00:00
Alexander Alekhin
c3e8a82c9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-28 23:53:54 +00:00
Josh Bradley
9fef09fe89
Merge pull request #17320 from jgbradley1:add-eigen-tensor-conversions
...
* add eigen tensor conversion functions
* add eigen tensor conversion tests
* add support for column major order
* update eigen tensor tests
* fix coding style and add conditional compilation
* fix conditional compilation checks
* remove whitespace
* rearrange functions for easier reading
* reformat function documentation and add tensormap unit test
* cleanup documentation of unit test
* remove condition duplication
* check Eigen major version, not minor version
* restrict to Eigen v3.3.0+
* add documentation note and add type checking to cv2eigen_tensormap()
2020-05-23 18:25:01 +00:00
Alexander Alekhin
593af7287b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-05-18 17:50:16 +00:00
Alexander Alekhin
a3b109eca0
imgproc: enable GaussianBlur IPP parallel processing
2020-05-17 11:40:34 +00:00
Alexander Alekhin
152e6476d9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-24 19:02:39 +00:00
Alexander Alekhin
3c14a8c507
Merge pull request #17149 from alalek:core_simd_suppress_coverity
2020-04-24 17:46:54 +00:00
Alexander Alekhin
cd7db168e0
core(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors
2020-04-24 16:36:35 +00:00
Alexander Alekhin
bfcc136dc7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-21 21:32:51 +00:00
Paul Jurczak
a748eba42e
Added descriptions of randu and randn
2020-04-20 07:13:37 +00:00
Alexander Alekhin
acf1be547d
Merge pull request #17046 from alalek:core_inputarray_matexpr_cleanup
2020-04-18 21:41:59 +00:00
Alexander Alekhin
fbaae7ac37
Merge pull request #17041 from alalek:core_simd_vector_ctors
2020-04-17 21:22:08 +00:00
Alexander Alekhin
dcf7eb972e
core(SIMD): align behavior of vector constructors
...
- setzero() calls are dropped due low-level API nature
- initialization is mandatory if necessary (not an output of other calls)
2020-04-17 14:34:34 +00:00
Maksim Shabunin
f84cae833a
TickMeter: added FPS and AvgTime, improved docs, reformatted
2020-04-16 21:33:29 +03:00
Alexander Alekhin
c8f1948d58
core: drop EXPR handing code in InputArray
2020-04-14 18:02:19 +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
Alexander Alekhin
9c58a7cb1e
Merge pull request #16653 from alalek:core_inputarray_matexpr
2020-04-10 16:57:17 +00:00
Alexander Alekhin
763a1d7392
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-06 15:57:43 +00:00
Alexander Alekhin
936428cb3b
core(MatExpr) fetch result before InputArray wrap
...
- avoid multiple expression evaluations
- avoid issues with reduced support of InputArray::EXPR
2020-04-06 15:28:32 +00:00
Adam Fowles
8334932a26
Merge pull request #16992 from afowles:fix-forEach-segfault
...
* Fixed divide by zero error in forEach
* Dedicated assertion for !empty
2020-04-06 14:49:02 +00:00
Alexander Alekhin
01dcfb0825
Merge tag '4.3.0'
2020-04-03 11:50:53 +00:00
Alexander Alekhin
01b2c5a77c
release: OpenCV 4.3.0
2020-04-03 11:45:28 +00:00
Alexander Alekhin
0812207db7
Merge tag '3.4.10'
2020-04-03 11:24:31 +00:00
Alexander Alekhin
1cc1e6fa56
release: OpenCV 3.4.10
2020-04-02 19:59:58 +00:00
Alexander Alekhin
4cdb4652cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-20 21:41:15 +00:00
Alexander Alekhin
377dd04224
core: fix .begin()/.end() of empty Mat
2020-03-20 14:08:45 +00:00
Alexander Alekhin
ca23c0e630
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-17 13:23:33 +03:00
Alexander Alekhin
77d1c20fb7
core(buffer_area): handle 'OPENCV_ENABLE_MEMORY_SANITIZER=ON' case
2020-03-16 19:34:08 +03:00
Alexander Alekhin
71ec112093
Merge pull request #16786 from alalek:issue_16398
2020-03-15 19:49:50 +00:00
Sayed Adel
9ea62bfddb
core:vsx reimplement v_broadcast_element()
...
There's no need to use `vec_perm()` instead of `vec_splat()`,
since instruction `vperm` is quite heavy compared to `vsplt[b,h,w]`.
2020-03-14 22:54:22 +02:00
Alexander Alekhin
4e56c1326f
core: adjust type of allocator_stats counter, allow to disable
2020-03-11 20:12:29 +03:00
Alexander Alekhin
850414a501
Merge pull request #16771 from alalek:update_version_4.3.0-pre
2020-03-11 10:24:56 +00:00
Alexander Alekhin
d00e58cdb0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-10 22:49:51 +00:00
Alexander Alekhin
612746b4e5
Merge pull request #16744 from alalek:fix_mat_aug_operators_use_after_free
2020-03-10 22:02:47 +00:00
Alexander Alekhin
3c85745e22
pre: OpenCV 4.3.0 (version++)
2020-03-10 15:00:03 +03:00
Alexander Alekhin
b7ecaceda8
pre: OpenCV 3.4.10 (version++)
...
- Android Manager version is not increased (stuck on 3.49)
2020-03-10 14:53:43 +03:00
Alexander Alekhin
619180dffd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-06 20:41:30 +00:00
Alexander Alekhin
3a2f40ac6f
core: don't allow reallocation in add/div/sub/bitwise aug operators
2020-03-06 13:00:40 +00:00
Manoj Gupta
880d2afb67
Fix building with ToT libc++
...
ToT libc++ (LLVM) no longer includes <sstream>
as part of <complex> which breaks building opencv.
Include <sstream> header explcitly to fix this.
2020-03-05 17:10:43 -08:00
Alexander Alekhin
90a4d67e8d
Merge pull request #16513 from pwuertz:cuda_py_interop
2020-03-05 11:56:07 +00:00
Alexander Alekhin
d4a17da7b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-03-04 20:49:09 +00:00
Alexander Alekhin
4f288a1e28
Merge pull request #16704 from alalek:core_log_once_log_if
...
* core(logger): add CV_LOG_ONCE_xxx() CV_LOG_IF_xxx() macros
* core(logger): keep tests disabled
2020-03-04 20:42:41 +00:00
Alexander Alekhin
333a767be4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-28 18:34:37 +00:00
Peter Würtz
5012fc5d23
Merge pull request #16684 from pwuertz:ignore_clang_mat_inl
...
* Ignore clang warnings for deprecated enum+enum operations in mat.inl.hpp
* build: added customization macros, cmake flags for OpenCV build
2020-02-28 21:21:03 +03:00
Alexander Alekhin
45d073f889
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-26 20:09:03 +03:00
Alexander Alekhin
2617c9aa64
Merge pull request #16673 from alalek:exclude_contrib_modules_4.x
2020-02-26 14:03:52 +00:00
Alexander Alekhin
84bb67e49b
exclude opencv_contrib modules
2020-02-26 15:12:45 +03:00
Peter Würtz
53c0189ed7
Allow access to CUDA memory and stream pointers for interoperability.
2020-02-26 11:11:03 +01:00
Maksim Shabunin
bf96d8239d
Use BufferArea in more places
2020-02-26 11:45:19 +03:00
Alexander Alekhin
01048e5603
Merge pull request #16616 from alalek:dnn_fix_input_shape
...
* dnn: fix processing of input shapes
- importer: avoid using of .setInput() => .setInputShape()
- setInput: shape limitation check (partial)
* dnn(test): test .setInput() in readNet()
2020-02-21 22:39:54 +03:00
Alexander Alekhin
966c2191cb
Merge pull request #13928 from catree:add_matx_div_operations
2020-02-21 22:35:03 +03:00
Maksim Shabunin
8b2c499be6
intrin: fixed int64->double conversion for AVX-512
2020-02-21 15:20:00 +03:00
Alexander Smorkalov
c87b99e82b
Added test for new MatX division.
2020-02-21 10:08:55 +03:00
Alexander Alekhin
aa2777ed61
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-10 19:40:29 +03:00
Pavel Rojtberg
e13a73d084
core: export getCPUFeaturesLine to bindings
2020-02-10 14:06:43 +01:00
Alexander Alekhin
eb14f9a464
Merge pull request #16463 from alalek:core_strong_ptr_alignment
2020-02-08 19:45:43 +00:00
Maksim Shabunin
55cdeaa6dd
BufferArea: initial version, usage in StereoBM
...
New class BufferArea is used to hide complexity of buffers allocations and allow instrumentation with valgrind and sanitizers.
2020-02-07 14:57:36 +03:00
Alexander Alekhin
bf2f7b0f8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-01 17:26:00 +00:00
gapry
ac9f8c1f41
Fixed Compilation warnings | Issue #16336
2020-02-01 03:32:42 +08:00
Alexander Alekhin
591f427003
Merge pull request #16459 from nh2:patch-1
2020-01-30 14:25:18 +00:00
Alexander Alekhin
a4bd7506a5
core: CV_STRONG_ALIGNMENT macro
...
Should be used to guard unsafe type casts of pointers
2020-01-29 18:44:17 +03:00
Niklas Hambüchen
70cbc3d883
cvdef.h: Don't use C's limits.h under C++
...
Just like with the other headers in the rest of the file.
See e.g. https://stackoverflow.com/questions/36831465/what-difference-does-it-make-when-i-include-limits-or-limits-h-in-my-c-cod
for the reasons, the most important one being that limits.h does not respect
namespaces, which can make problems for downstream consumers of cvdef.h.
2020-01-29 16:41:31 +01:00
Sayed Adel
ec033330df
core:vsx workaround for the unexpected results of vec_vbpermq
in gcc4.9
2020-01-29 15:05:12 +02:00
Sayed Adel
bd531bd828
core:vsx fix inline asm constraints
...
generalize constraints to 'wa' for VSX registers
2020-01-28 15:48:00 +02: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
d42e04d0df
core(SIMD): fix MSA build - add v_reduce_min/max for u8/s8
2020-01-20 15:10:03 +03:00
Chip Kerchner
301626ba26
Merge pull request #15488 from ChipKerchner:vectorizeMinMax2
...
Vectorize minMaxIdx functions
* Updated documentation and intrinsic tests for v_reduce
* Add other files back in from the forced push
* Prevent an constant overflow with v_reduce for int8 type
* Another alternative to fix constant overflow warning.
* Fix another compiler warning.
* Update comments and change comparison form to be consistent with other vectorized loops.
* Change return type of v_reduce_min & max for v_uint8 and v_uint16 to be same as lane type.
* Cast v_reduce functions to int to avoid overflow. Reduce number of parameters in MINMAXIDX_REDUCE macro.
* Restore cast type for v_reduce_min & max to LaneType
2020-01-17 19:37:35 +03:00
Alexander Alekhin
fb61f88b9c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-01-12 09:35:39 +00:00
Alexander Alekhin
a9f3acb125
core(simd): fix NEON alignmnet issue
2020-01-11 18:39:50 +00:00
Alexander Alekhin
e180cc050b
Merge pull request #16236 from alalek:fix_core_simd_emulator
...
* core: fix intrin_cpp, allow to build modules with SIMD emulator
* core(arithm): fix v_zero initialization
* core(simd): 'strict' types for binary/bitwise operations
* features2d: avoid aligned load issue in GCC 5.4 with emulated SIMD
* core(simd): alignment checks in SIMD emulator
2020-01-10 21:31:02 +03:00
Alexander Alekhin
523f081923
core(check): add Size_<int>
2019-12-28 13:50:39 +00:00
Brian Wignall
f9c514b391
Fix spelling typos
...
backport commit 659ffaddb4
2019-12-27 12:46:53 +00:00
Brian Wignall
659ffaddb4
Fix spelling typos
2019-12-26 06:45:03 -05:00
Alexander Alekhin
89d3f95a8e
Merge tag '4.2.0'
2019-12-20 17:06:45 +03:00
Alexander Alekhin
bda89a6469
release: OpenCV 4.2.0
2019-12-20 16:44:16 +03:00
Alexander Alekhin
5e2bcc9149
Merge tag '3.4.9'
2019-12-20 12:44:15 +03:00
Alexander Alekhin
64e6cf9fe5
release: OpenCV 3.4.9
2019-12-19 18:16:47 +03: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
dff8e29f98
Merge pull request #16139 from alalek:core_flip_avoid_unaligned
2019-12-19 10:29:07 +00:00
Alexander Alekhin
8d22ac200f
core: workaround flipHoriz() alignment issues
2019-12-19 00:05:23 +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
92b9888837
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-12 13:02:19 +03:00
Alexander Alekhin
f2cce5fd8c
Merge pull request #16125 from alalek:core_safe_xadd
2019-12-11 14:15:46 +00:00
Alexander Alekhin
7d61426279
Merge pull request #16124 from alalek:issue_13354
2019-12-11 14:15:23 +00:00
Alexander Alekhin
416848066c
core: provide safe implementations of CV_XADD() only
2019-12-11 00:48:45 +00:00
Alexander Alekhin
76b5e19eb3
core: add "namespace cv" in CV_StaticAssert fallback implementation
2019-12-11 00:35:13 +00:00
Alexander Alekhin
a675c4937a
core: OPENCV_INCLUDE_PORT_FILE for custom platform configuration
2019-12-11 00:31:45 +00:00
Paul Murphy
a011035ed6
Merge pull request #15257 from pmur:resize
...
* resize: HResizeLinear reduce duplicate work
There appears to be a 2x unroll of the HResizeLinear against k,
however the k value is only incremented by 1 during the unroll. This
results in k - 1 duplicate passes when k > 1.
Likewise, the final pass may not respect the work done by the vector
loop. Start it with the offset returned by the vector op if
implemented. Note, no vector ops are implemented today.
The performance is most noticable on a linear downscale. A set of
performance tests are added to characterize this. The performance
improvement is 10-50% depending on the scaling.
* imgproc: vectorize HResizeLinear
Performance is mostly gated by the gather operations
for x inputs.
Likewise, provide a 2x unroll against k, this reduces the
number of alpha gathers by 1/2 for larger k.
While not a 4x improvement, it still performs substantially
better under P9 for a 1.4x improvement. P8 baseline is
1.05-1.10x due to reduced VSX instruction set.
For float types, this results in a more modest
1.2x improvement.
* Update U8 processing for non-bitexact linear resize
* core: hal: vsx: improve v_load_expand_q
With a little help, we can do this quickly without gprs on
all VSX enabled targets.
* resize: Fix cn == 3 step per feedback
Per feedback, ensure we don't overrun. This was caught via the
failure observed in Test_TensorFlow.inception_accuracy.
2019-12-09 14:54:06 +03:00
Alexander Alekhin
c3023fb52b
pre: OpenCV 4.2.0 (version++)
2019-12-06 12:58:57 +03:00
Alexander Alekhin
76a27e3399
pre: OpenCV 3.4.9 (version++)
2019-12-05 18:28:38 +00:00
Alexander Alekhin
8108fb0575
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-05 18:27:45 +03:00
Alexander Alekhin
f21bde4d9f
Merge pull request #16046 from alalek:issue_15990
...
* core: disable invalid constructors in C API by default
- C API objects will lose their default initializers through constructors
* samples: stop using of C API
2019-12-05 14:48:18 +03:00
Alexander Alekhin
01a28db949
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-29 18:57:33 +03:00
Vadim Levin
8d74101f07
Merge pull request #15955 from VadimLevin:dev/vlevin/generator_tests
...
Tests for argument conversion of Python bindings generator
* Tests for parsing elemental types from Python bindings
- Add positive and negative tests for int, float, double, size_t,
const char*, bool.
- Tests with wrong conversion behavior are skipped.
* Move implicit conversion of bool to integer/floating types to wrong
conversion behavior.
2019-11-29 16:24:13 +03:00
Alexander Alekhin
70146700aa
Merge pull request #15839 from alalek:core_simd_v_setall_template
2019-11-27 19:19:35 +00:00
Brian Wignall
af997529a1
Fix some typos
2019-11-26 18:41:19 +03:00
Brian Wignall
9276f1910b
Fix some typos
2019-11-25 19:55:07 -05:00
Alexander Alekhin
ad0ab4109a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-22 22:47:13 +00:00
Alexander Alekhin
ec55b6f6db
core: fix MSA build
2019-11-21 18:59:41 +03:00
Everton Constantino
75315fb297
Merge pull request #15494 from everton1984:hal_vector_get_n
...
Improving VSX performance of integral function
* Adding support for vector get function on VSX datatypes so the
integral function gains a bit of performance.
* Removing get as a datatype member function and implementing a new HAL
instruction v_extract_n to get the n-th element of a vector register.
* Adding SSE/NEON/AVX intrinsics.
* Implement new HAL instruction v_broadcast_element on VSX/AVX/NEON/SSE.
* core(simd): add tests for v_extract_n/v_broadcast_element
- updated docs
- commented out code to repair compilation
- added WASM and MSA default implementations
* core(simd): fix compilation
- x86: avoid _mm256_extract_epi64/32/16/8 with MSVS 2015
- x86: _mm_extract_epi64 is 64-bit only
* cleanup
2019-11-20 13:41:07 +03:00
Alexander Alekhin
318cba4ce3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-19 19:48:49 +00:00
Alexander Alekhin
e07a488012
Merge pull request #15925 from alalek:core_test_simd_cpp_emulation
...
core(test): extending tests with SIMD C++ emulation code (intrin_cpp.hpp)
* core(test): test SIMD CPP emulation code (intrin_cpp.hpp)
* core(simd): eliminate build warnings from intrin_cpp.hpp
2019-11-19 21:08:45 +03: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
6773b938b3
Merge pull request #15896 from alalek:build_gcc_9
2019-11-14 14:22:02 +00:00
Christoph Bachhuber
c638f085aa
Refactor for clarity and avoiding code duplication
...
Implement GArik's comments
Remove unnecessary c_str()
Fix brace position
2019-11-12 19:22:42 +01:00
Alexander Alekhin
7ecdcf6ca6
build: GCC9 compilation
2019-11-12 18:49:34 +03:00
Alexander Alekhin
b6a58818bb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-11 20:25:42 +00:00
Igor Murzov
6d5b900324
Simplify OpenCL info dumping code:
...
* Reduce code nesting
* Drop redundant .c_str() calls
2019-11-05 14:49:49 +03:00
Alexander Alekhin
0d7f770996
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-04 09:58:29 +00:00
Alexander Alekhin
a893969ec9
core(simd): v_setall template
2019-11-03 12:49:25 +00:00
Alexander Alekhin
5c12bafe80
Merge pull request #15805 from i-murzov:3.4
2019-10-31 20:39:16 +00:00
Igor Murzov
a9d23a6479
Fix wording in some tutorials
2019-10-30 13:27:17 +03:00
Alexander Alekhin
ea5499fa51
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-29 20:46:51 +00:00
Alexander Alekhin
bad4e5c3eb
Merge pull request #15692 from alalek:core_tls_handle_thread_termination
2019-10-29 20:40:35 +00:00
Alexander Alekhin
055ffc0425
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-10-24 18:21:19 +00:00
Alexander Alekhin
17e2bf5717
core(tls): implement releasing of TLS on thread termination
...
- move TLS & instrumentation code out of core/utility.hpp
- (*) TLSData lost .gather() method (to dispose thread data on thread termination)
- use TLSDataAccumulator for reliable collecting of thread data
- prefer using of .detachData() + .cleanupDetachedData() instead of .gather() method
(*) API is broken: replace TLSData => TLSDataAccumulator if gather required
(objects disposal on threads termination is not available in accumulator mode)
2019-10-24 06:36:18 +00:00
Chip Kerchner
5a6a49405d
Merge pull request #15738 from ChipKerchner:bugInt64x2Comparison
...
Fixing bug with comparison of v_int64x2 or v_uint64x2
* Casting v_uint64x2 to v_float64x2 and comparing does NOT work in all cases. Rewrite using epi64 instructions - faster too.
* Fix bad merge.
* Fix equal comparsion for non-SSE4.1. Add test cases for v_int64x2 comparisons.
* Try to fix merge conflict.
* Only test v_int64x2 comparisons if CV_SIMD_64F
* Fix compiler warning.
2019-10-22 16:37:20 +03:00
Alexander Alekhin
24ebca5c59
core(simd): v_reverse() for MSA backend
2019-10-18 16:43:03 +03:00
Alexander Alekhin
a2b3cd9a2c
Merge pull request #15709 from alalek:js_simd_reverse
2019-10-17 13:14:50 +00:00
Alexander Alekhin
d31da08d43
Merge pull request #15708 from alalek:js_simd_support_1.38.48
2019-10-17 13:14:34 +00:00