Mirrors/opencv
0
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-01-18 17:21:42 +01:00
Code Packages Releases Activity
11,164 Commits 9 Branches 130 Tags
2.4
Commit Graph

11164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Alekhin
82f8176b06 Merge pull request #14676 from 103yiran:103yiran-clang 2019-05-30 14:19:14 +03:00
103yiran
a03b7575ba make it compatible with clang 2019-05-30 14:04:40 +08:00
Alexander Alekhin
8bae39ce8a Merge pull request #13669 from alalek:test_eigen_relax_eps_2.4 2019-01-21 18:32:22 +03:00
Alexander Alekhin
aa89881321 Merge pull request #13665 from alalek:backport_8294_flann_rand 2019-01-21 15:33:37 +03:00
Alexander Alekhin
30b01a2d29 core(test): relax eigen eps value: 0.01 -> 0.02 2019-01-21 15:18:10 +03:00
Alexander Alekhin
dc328451eb flann: use OpenCV theRNG() 
std::rand() has no thread-safe guarantee.

backport commit: 147f3ebf0a
 2019-01-21 13:45:08 +03:00
Alexander Alekhin
a49600cb24 Merge pull request #13510 from knsong:2.4 2018-12-25 13:08:02 +03:00
Kangning Song
0157ff0bc3 fix initial values bug 2018-12-23 11:29:42 +08:00
Alexander Alekhin
7e71666a0b Merge pull request #13448 from alalek:issue_13445_2.4 2018-12-16 00:17:39 +03:00
Alexander Alekhin
7b677bb017 videoio(dc1394): use lazy initialization on demand 
backport eb1f3733ee into 2.4
 2018-12-15 08:09:22 +00:00
Alexander Alekhin
9b954de175 Merge pull request #13265 from xusiwei:2.4 2018-11-25 12:12:09 +00:00
Siwei Xu
7f3af2b2d9 androidcamera: add a missing header. 
fix #11699 Missing std header
 2018-11-24 01:31:50 +08:00
Alexander Alekhin
fd63c60418 Merge pull request #12181 from alalek:fix_gpu_sparse_multi_definition 2018-08-08 18:38:30 +03:00
Alexander Alekhin
1c34941537 Merge pull request #12179 from alalek:fix_gpu_samples_2.4 2018-08-08 18:37:12 +03:00
Alexander Alekhin
b0f0194595 gpu(sparse_multi): fix definition without TBB 2018-08-08 16:26:55 +03:00
Alexander Alekhin
8484c8af7c samples(gpu): fix build (invalid access to cvconfig.h from sample) 
via find_package(OpenCV)
 2018-08-08 16:26:18 +03:00
Alexander Alekhin
51cfa51924 OpenCV version++ 
2.4.13.7
2.4.13.7 		2018-07-02 15:41:56 +03:00
Alexander Alekhin
f1c5d8364f Merge pull request #11640 from alalek:backport_11617 2018-05-31 18:28:49 +00:00
Alexander Alekhin
19f4c4403a videoio(ffmpeg): specify stream->time_base 
backport 5128c1ff1f
 2018-05-31 18:34:43 +03:00
Alexander Alekhin
e89405d48f Merge pull request #11534 from juanecito:2.4 
Thread-safe version of sparse function in cv::gpu::PyrLKOpticalFlow 2
 2018-05-31 15:29:14 +00:00
juanitov
eaf0b04530 Add sample of sparse pyrlk optical flow thread safe 2018-05-31 16:36:45 +03:00
juanitov
cbae431752 Fix HAVE_TBB is not defined in pyrlk.cu in spite of CMake TBB option is ON 2018-05-31 16:34:49 +03:00
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
 2018-05-16 14:32:42 +03:00
Alexander Alekhin
a32aec5ba6 Merge pull request #11496 from shengyu7697:tab_to_space 
tab to space
 2018-05-10 19:33:54 +03:00
shengyu
dd131219b2 tab to space 2018-05-10 23:14:04 +08:00
Alexander Alekhin
2cf58febf8 Merge pull request #11369 from ilovezfs:ffmpeg-4.0 
Fix build with FFmpeg 4.0
 2018-04-21 22:14:40 +03:00
ilovezfs
99091a6246 Fix build with FFmpeg 4.0 
Backport of https://github.com/opencv/opencv/pull/10011.
 2018-04-21 09:09:12 -07:00
Alexander Alekhin
0354d01e79 OpenCV version++ 
2.4.13.6
2.4.13.6 		2018-02-21 18:27:31 +00:00
Alexander Alekhin
45d3aac730 Merge pull request #10913 from alalek:fix_imgcodecs_hang_2.4 2018-02-21 16:39:59 +03:00
Alexander Alekhin
318ac6b8c9 imgcodecs: fix RBaseStream hang on truncated inputs 
6e8241b78d
 2018-02-21 13:24:08 +03:00
Alexander Alekhin
7d332100a4 Merge pull request #10901 from alalek:backport_imgcodecs_fixes 
(2.4) backport imgcodecs fixes
 2018-02-20 11:42:04 +03:00
Alexander Alekhin
56072c4406 imgcodecs: add more Jasper checks for supported and tested cases 
435a3e337b
 2018-02-19 16:43:47 +03:00
Alexander Alekhin
cd64b504b8 imgcodecs: add overflow checks 
imgcodecs: remove assert() usage

Origin commits:
- be5247921d
- 8a76fadaa3
 2018-02-19 16:38:08 +03:00
Alexander Alekhin
443059e371 imgcodecs(pxm): fix memcpy size 
7bbe1a53cf
 2018-02-19 16:37:51 +03:00
Alexander Alekhin
8f9c4d23e0 Merge pull request #10695 from mworchel:blobdetector_mask 
Add mask support to SimpleBlobDetector
 2018-01-30 21:00:46 +03:00
mworchel
8b90db3f25 Add mask support to SimpleBlobDetector 2018-01-25 13:34:12 +01:00
Alexander Alekhin
ec16307632 Merge pull request #10509 from kislinsk:support-msvc-14.1-minor-upgrades 2018-01-04 19:02:31 +03:00
Alexander Alekhin
fdefc4b09d cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values 
backport 8e21f808be
 2018-01-04 14:58:01 +00:00
Stefan Dinkelacker
61d8292652 cmake: add support for MSVC 14.1 minor upgrades 2018-01-04 15:39:19 +01:00
Alexander Alekhin
43f1b72e92 Merge pull request #10443 from alalek:backport_10435 
(2.4 backport) Fixed #10433
 2017-12-28 18:27:33 +03:00
Arthur Williams
1f4b8c2785 Fixed #10433 
backport #10435
 2017-12-28 02:32:43 +00:00
Alexander Alekhin
97eae6b546 OpenCV version++ 
2.4.13.5
2.4.13.5 		2017-12-19 23:11:33 +00:00
Alexander Alekhin
572d6d795d Merge pull request #10301 from alalek:cmake_timestamp_update_2.4 
(2.4) cmake: update timestamp status
 2017-12-13 17:42:53 +03:00
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
 2017-12-13 17:05:33 +03:00
Alexander Alekhin
249edb2c99 Merge pull request #10204 from alalek:fix_calib3d_fisheye_rectify_test_2.4 2017-12-01 18:31:21 +03:00
Alexander Alekhin
00cc4aa230 calib3d: fix fisheye stereoRectify test 
- don't write into testdata directory
- check matrices instead of result images
 2017-11-30 16:41:37 +03:00
Alexander Alekhin
7c0193bb75 Merge pull request #10198 from alalek:fix_build_xcode_9.1_2.4 
(2.4) Fix build with Xcode 9.1
 2017-11-30 16:27:26 +03:00
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)
 2017-11-30 14:24:05 +03:00
Alexander Alekhin
91fe01beca Merge pull request #10052 from alalek:fix_macos_pkg_config_2.4 
(2.4) cmake: fix pkg-config generation for MacOSX
 2017-11-08 19:03:44 +00:00
Alexander Alekhin
591a08721e cmake: fix pkg-config generation for MacOSX 2017-11-08 19:40:02 +03:00