Alexander Alekhin
82f8176b06
Merge pull request #14676 from 103yiran:103yiran-clang
6 years ago
103yiran
a03b7575ba
make it compatible with clang
6 years ago
Alexander Alekhin
8bae39ce8a
Merge pull request #13669 from alalek:test_eigen_relax_eps_2.4
6 years ago
Alexander Alekhin
aa89881321
Merge pull request #13665 from alalek:backport_8294_flann_rand
6 years ago
Alexander Alekhin
30b01a2d29
core(test): relax eigen eps value: 0.01 -> 0.02
6 years ago
Alexander Alekhin
dc328451eb
flann: use OpenCV theRNG()
...
std::rand() has no thread-safe guarantee.
backport commit: 147f3ebf0a
6 years ago
Alexander Alekhin
a49600cb24
Merge pull request #13510 from knsong:2.4
6 years ago
Kangning Song
0157ff0bc3
fix initial values bug
6 years ago
Alexander Alekhin
7e71666a0b
Merge pull request #13448 from alalek:issue_13445_2.4
6 years ago
Alexander Alekhin
7b677bb017
videoio(dc1394): use lazy initialization on demand
...
backport eb1f3733ee
into 2.4
6 years ago
Alexander Alekhin
9b954de175
Merge pull request #13265 from xusiwei:2.4
6 years ago
Siwei Xu
7f3af2b2d9
androidcamera: add a missing header.
...
fix #11699 Missing std header
6 years ago
Alexander Alekhin
fd63c60418
Merge pull request #12181 from alalek:fix_gpu_sparse_multi_definition
6 years ago
Alexander Alekhin
1c34941537
Merge pull request #12179 from alalek:fix_gpu_samples_2.4
6 years ago
Alexander Alekhin
b0f0194595
gpu(sparse_multi): fix definition without TBB
6 years ago
Alexander Alekhin
8484c8af7c
samples(gpu): fix build (invalid access to cvconfig.h from sample)
...
via find_package(OpenCV)
6 years ago
Alexander Alekhin
51cfa51924
OpenCV version++
...
2.4.13.7
6 years ago
Alexander Alekhin
f1c5d8364f
Merge pull request #11640 from alalek:backport_11617
7 years ago
Alexander Alekhin
19f4c4403a
videoio(ffmpeg): specify stream->time_base
...
backport 5128c1ff1f
7 years ago
Alexander Alekhin
e89405d48f
Merge pull request #11534 from juanecito:2.4
...
Thread-safe version of sparse function in cv::gpu::PyrLKOpticalFlow 2
7 years ago
juanitov
eaf0b04530
Add sample of sparse pyrlk optical flow thread safe
7 years ago
juanitov
cbae431752
Fix HAVE_TBB is not defined in pyrlk.cu in spite of CMake TBB option is ON
7 years ago
Juan María Gómez López
0239c195d8
Merge pull request #11060 from juanecito:2.4
...
* Thread-safe version of sparse function in cv::gpu::PyrLKOpticalFlow
class. The new function name is sparse_multi
* Thread-safe sparse function in cv::gpu::PyrLKOpticalFlow. Tests
* Thread-safe sparse function in cv::gpu::PyrLKOpticalFlow class.
Add intel_TBB conditional compilation
7 years ago
Alexander Alekhin
a32aec5ba6
Merge pull request #11496 from shengyu7697:tab_to_space
...
tab to space
7 years ago
shengyu
dd131219b2
tab to space
7 years ago
Alexander Alekhin
2cf58febf8
Merge pull request #11369 from ilovezfs:ffmpeg-4.0
...
Fix build with FFmpeg 4.0
7 years ago
ilovezfs
99091a6246
Fix build with FFmpeg 4.0
...
Backport of https://github.com/opencv/opencv/pull/10011 .
7 years ago
Alexander Alekhin
0354d01e79
OpenCV version++
...
2.4.13.6
7 years ago
Alexander Alekhin
45d3aac730
Merge pull request #10913 from alalek:fix_imgcodecs_hang_2.4
7 years ago
Alexander Alekhin
318ac6b8c9
imgcodecs: fix RBaseStream hang on truncated inputs
...
6e8241b78d
7 years ago
Alexander Alekhin
7d332100a4
Merge pull request #10901 from alalek:backport_imgcodecs_fixes
...
(2.4) backport imgcodecs fixes
7 years ago
Alexander Alekhin
56072c4406
imgcodecs: add more Jasper checks for supported and tested cases
...
435a3e337b
7 years ago
Alexander Alekhin
cd64b504b8
imgcodecs: add overflow checks
...
imgcodecs: remove assert() usage
Origin commits:
- be5247921d
- 8a76fadaa3
7 years ago
Alexander Alekhin
443059e371
imgcodecs(pxm): fix memcpy size
...
7bbe1a53cf
7 years ago
Alexander Alekhin
8f9c4d23e0
Merge pull request #10695 from mworchel:blobdetector_mask
...
Add mask support to SimpleBlobDetector
7 years ago
mworchel
8b90db3f25
Add mask support to SimpleBlobDetector
7 years ago
Alexander Alekhin
ec16307632
Merge pull request #10509 from kislinsk:support-msvc-14.1-minor-upgrades
7 years ago
Alexander Alekhin
fdefc4b09d
cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values
...
backport 8e21f808be
7 years ago
Stefan Dinkelacker
61d8292652
cmake: add support for MSVC 14.1 minor upgrades
7 years ago
Alexander Alekhin
43f1b72e92
Merge pull request #10443 from alalek:backport_10435
...
(2.4 backport) Fixed #10433
7 years ago
Arthur Williams
1f4b8c2785
Fixed #10433
...
backport #10435
7 years ago
Alexander Alekhin
97eae6b546
OpenCV version++
...
2.4.13.5
7 years ago
Alexander Alekhin
572d6d795d
Merge pull request #10301 from alalek:cmake_timestamp_update_2.4
...
(2.4) cmake: update timestamp status
7 years ago
Alexander Alekhin
7459388dd9
cmake: update timestamp status
...
- avoid unnecessary rebuilding of OpenCV libraries
- use timestamp of the first launch of CMake
- to return to previous behavior use `-UOPENCV_TIMESTAMP` CMake option
original commit: 3e45795232
7 years ago
Alexander Alekhin
249edb2c99
Merge pull request #10204 from alalek:fix_calib3d_fisheye_rectify_test_2.4
7 years ago
Alexander Alekhin
00cc4aa230
calib3d: fix fisheye stereoRectify test
...
- don't write into testdata directory
- check matrices instead of result images
7 years ago
Alexander Alekhin
7c0193bb75
Merge pull request #10198 from alalek:fix_build_xcode_9.1_2.4
...
(2.4) Fix build with Xcode 9.1
7 years ago
Alexander Alekhin
97507e42a1
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]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7s' [-Wignored-optimization-argument]
- backport IOS_ARCH toolchain option and setup CMAKE_SYSTEM_PROCESSOR:
- adds '-mfpu=neon' compiler flag for ARM, SSE flags for i386/x86_64
- fixed proper libpng compilation (no ARM asm)
7 years ago
Alexander Alekhin
91fe01beca
Merge pull request #10052 from alalek:fix_macos_pkg_config_2.4
...
(2.4) cmake: fix pkg-config generation for MacOSX
7 years ago
Alexander Alekhin
591a08721e
cmake: fix pkg-config generation for MacOSX
7 years ago