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
Alexander Alekhin
a28733148e
Merge pull request #10038 from alalek:update_gitignore_2.4
...
(2.4) git: .gitignore update
2017-11-07 20:00:56 +00:00
Alexander Alekhin
e10e628036
git: .gitignore update
...
ignore all "dot" files/directories by default.
'ignored' files can be added via 'git add -f' command if necessary.
2017-11-07 17:35:13 +03:00
Alexander Alekhin
738b388a64
Merge pull request #10030 from hosjiu1702:2.4
...
change from variance to standard deviation
2017-11-07 10:59:09 +00:00
Alexander Alekhin
9802024f71
Merge pull request #9974 from opalmirror:test_stereo_min_disparity_24
...
test_stereomatching.cpp: validate min disparity affect on valid ROI
2017-11-07 10:05:21 +00:00
hosjiu1702
1659e96766
change from variance to standard deviation
2017-11-06 11:42:24 +07:00
James Perkins
c1dea8465e
test_stereomatching.cpp: validate min disparity affect on valid ROI
2017-10-30 11:27:11 -07:00
Alexander Alekhin
678d383f26
Merge pull request #9844 from opalmirror:fix_stereobm_mindisp_truncation_24
...
fix StereoBM disparity map right margin truncation when minDisparities > 0
2017-10-30 18:48:48 +03:00
Alexander Alekhin
e15a56d142
Merge pull request #9915 from alalek:backport_9903
...
(2.4) Backport #9903 : Fix out of bounds write
2017-10-26 12:19:38 +03:00
blendin
c46521ad65
Fix out of bounds write
2017-10-23 12:43:22 +03:00
Alexander Alekhin
d0f3468477
Merge pull request #9873 from alalek:fix_documentation_2.4
...
(2.4) doc: fix youtube videos handling
2017-10-17 21:40:34 +03:00
Alexander Alekhin
3224b0a75a
doc: fix youtube videos handling
2017-10-17 16:52:00 +03:00
James Perkins
7d8110772a
fix StereoBM disparity map right margin truncation when minDisparities > 0
2017-10-12 17:20:28 -07:00
Alexander Alekhin
fb4c2ba64d
OpenCV version++
...
2.4.13.4
2.4.13.4
2017-10-12 14:32:33 +03:00
Alexander Alekhin
e53f1b2532
Merge pull request #9808 from alalek:backport_fixes
...
(2.4) backport fixes
2017-10-10 13:13:23 +03:00
Yaron Inger
621a1d3b09
videoio: remove AssetsLibrary dependency.
...
The entire AssetsLibrary framework is deprecated since iOS 8.0. The code
used in the camera example code can use UIKit to save videos to the
camera instead, which allows to avoid linking with PhotoKit instead to
prevent increasing the iOS deployment target.
2017-10-09 15:14:25 +03:00
berak
14b686cdc7
imgcodecs: fix 4 reading channel bmp images
2017-10-09 15:11:28 +03:00