Alexander Alekhin [Wed, 20 Apr 2016 13:24:25 +0000 (13:24 +0000)]
Merge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4
Alexander Alekhin [Tue, 19 Apr 2016 14:19:41 +0000 (14:19 +0000)]
Merge pull request #6431 from StevenPuttemans:add_fixed_video_2.4
Alexander Alekhin [Tue, 19 Apr 2016 13:32:44 +0000 (13:32 +0000)]
Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4
StevenPuttemans [Tue, 19 Apr 2016 08:43:20 +0000 (10:43 +0200)]
add fixed video
Kevin, Hu [Tue, 19 Apr 2016 11:27:42 +0000 (19:27 +0800)]
Restore 2.4 source branch for bug fix 6317.
Alexander Alekhin [Mon, 18 Apr 2016 15:12:16 +0000 (15:12 +0000)]
Merge pull request #6421 from alalek:backport_6417
Suleyman TURKMEN [Sat, 16 Apr 2016 21:37:28 +0000 (00:37 +0300)]
fix for writing 16-bit jpeg2000
Maksim Shabunin [Sat, 16 Apr 2016 06:39:00 +0000 (06:39 +0000)]
Merge pull request #6415 from mshabunin:fix-xcode-warnings-24
Maksim Shabunin [Fri, 15 Apr 2016 18:56:50 +0000 (21:56 +0300)]
Updates for XCode 7.3
StevenPuttemans [Thu, 14 Apr 2016 09:17:36 +0000 (11:17 +0200)]
add visualisation tool for 2.4 branch
Alexander Alekhin [Wed, 13 Apr 2016 13:38:53 +0000 (13:38 +0000)]
Merge pull request #6373 from terfendail:vt/stereobm_valgrind
Maksim Shabunin [Wed, 13 Apr 2016 10:02:56 +0000 (10:02 +0000)]
Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4
StevenPuttemans [Mon, 11 Apr 2016 10:44:55 +0000 (12:44 +0200)]
vectorize process + enable early quitting/storage + enable delete annotation option
Vitaly Tuzov [Tue, 12 Apr 2016 14:31:12 +0000 (17:31 +0300)]
Cost estimation boundaries description updated
Vitaly Tuzov [Tue, 12 Apr 2016 14:27:16 +0000 (17:27 +0300)]
Backport of StereoBM uninitialized memory access problem fix from master branch
Maksim Shabunin [Tue, 12 Apr 2016 08:40:01 +0000 (08:40 +0000)]
Merge pull request #6383 from alalek:backport_6381
Maksim Shabunin [Tue, 12 Apr 2016 08:29:44 +0000 (08:29 +0000)]
Merge pull request #6386 from mshabunin:fix-python-test-issue
Maksim Shabunin [Mon, 11 Apr 2016 15:45:14 +0000 (18:45 +0300)]
Fixed problem with nonfree python test: could not find local test images
Philipp Hasper [Mon, 11 Apr 2016 07:55:33 +0000 (09:55 +0200)]
operator<< handles keys starting with underscore
Vitaly Tuzov [Sat, 20 Feb 2016 10:29:34 +0000 (13:29 +0300)]
Fixed uninitialized memory errors in stereoBM
Alexander Alekhin [Tue, 5 Apr 2016 16:29:15 +0000 (16:29 +0000)]
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
Alexander Alekhin [Tue, 5 Apr 2016 15:25:15 +0000 (15:25 +0000)]
Merge pull request #6365 from terfendail:vt/nonlocal_testdata
Vitaly Tuzov [Tue, 5 Apr 2016 08:21:22 +0000 (11:21 +0300)]
Fix for nonlocal data requirement in test2.py
Alexander Alekhin [Tue, 5 Apr 2016 11:18:44 +0000 (14:18 +0300)]
ffmpeg: interrupt callback fix
backport from master
Alexander Alekhin [Tue, 29 Mar 2016 16:06:27 +0000 (16:06 +0000)]
Merge pull request #6343 from terfendail:vt/python_rng_seed_backport
Vitaly Tuzov [Tue, 29 Mar 2016 14:59:48 +0000 (17:59 +0300)]
Backport of setRNGSeed implementation and python test randomness fix
Alexander Alekhin [Tue, 29 Mar 2016 12:36:51 +0000 (12:36 +0000)]
Merge pull request #6341 from SpecLad:destroy-leak
Roman Donchenko [Tue, 29 Mar 2016 11:06:05 +0000 (14:06 +0300)]
Fix a memory leak indirectly caused by cvDestroyWindow
Alexander Smorkalov [Thu, 24 Mar 2016 17:16:52 +0000 (17:16 +0000)]
Merge pull request #6320 from terfendail:vt/pytestarm64
Vitaly Tuzov [Wed, 23 Mar 2016 14:18:54 +0000 (17:18 +0300)]
Made texture flow python test less strict to fix it on AARCH64
Alexander Smorkalov [Mon, 21 Mar 2016 15:01:04 +0000 (15:01 +0000)]
Merge pull request #6297 from terfendail:vt/pytestarm
Maksim Shabunin [Mon, 21 Mar 2016 14:09:21 +0000 (14:09 +0000)]
Merge pull request #6287 from StevenPuttemans:add_num_features_info_2.4
Vitaly Tuzov [Fri, 18 Mar 2016 10:17:26 +0000 (13:17 +0300)]
Fixed face detection python test
StevenPuttemans [Thu, 17 Mar 2016 12:33:11 +0000 (13:33 +0100)]
add cascade classifier info - total number of unique features passed to boosting process
Alexander Smorkalov [Thu, 17 Mar 2016 12:27:12 +0000 (12:27 +0000)]
Merge pull request #6279 from terfendail:vt/pythontest_data
Vitaly Tuzov [Thu, 10 Mar 2016 12:31:24 +0000 (15:31 +0300)]
Test data necessary for python samples added to test package.
Test launch script updated to run new tests as well.
Alexander Smorkalov [Thu, 17 Mar 2016 08:09:13 +0000 (08:09 +0000)]
Merge pull request #6281 from SpecLad:videowriter-oob
Roman Donchenko [Wed, 16 Mar 2016 16:36:53 +0000 (19:36 +0300)]
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
Roman Donchenko [Wed, 16 Mar 2016 13:28:59 +0000 (16:28 +0300)]
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
Alexander Smorkalov [Wed, 16 Mar 2016 11:41:27 +0000 (11:41 +0000)]
Merge pull request #6276 from SpecLad:bp-3813
Roman Donchenko [Tue, 15 Mar 2016 11:13:31 +0000 (14:13 +0300)]
Backport PR #3813 to 2.4
It has already been partially backported by #6199; this commit completes
the backport.
Alexander Alekhin [Mon, 14 Mar 2016 11:26:33 +0000 (11:26 +0000)]
Merge pull request #6245 from delftswa2016:fix-for-issue-4375
shruthikashyap [Sun, 13 Mar 2016 12:32:24 +0000 (13:32 +0100)]
Adding the syntax and usage for cv2.undistortPoints().
Vadim Pisarevsky [Sat, 12 Mar 2016 16:38:56 +0000 (16:38 +0000)]
Merge pull request #6236 from alalek:backport_6232
Alexander Alekhin [Fri, 11 Mar 2016 14:20:16 +0000 (14:20 +0000)]
Merge pull request #6237 from mshabunin:fix-vtk-on-2.4
Maksim Shabunin [Fri, 11 Mar 2016 13:18:38 +0000 (16:18 +0300)]
Ported VTK cmake detection from master branch
Piotr Semenov [Thu, 10 Mar 2016 08:58:32 +0000 (11:58 +0300)]
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
Alexander Alekhin [Fri, 11 Mar 2016 10:06:25 +0000 (10:06 +0000)]
Merge pull request #6234 from asmorkalov:as/deb_version_check
Alexander Smorkalov [Fri, 11 Mar 2016 08:59:15 +0000 (11:59 +0300)]
Added check if debian package version matches version from version.hpp
Maksim Shabunin [Thu, 10 Mar 2016 09:09:32 +0000 (09:09 +0000)]
Merge pull request #6171 from terfendail:vt/new_python_tests_backport
Maksim Shabunin [Thu, 10 Mar 2016 08:10:19 +0000 (08:10 +0000)]
Merge pull request #6228 from wangguoqin1001:2.4
WANG Guoqin [Wed, 9 Mar 2016 18:49:10 +0000 (02:49 +0800)]
MacOSX / QTKit capture: trying to fix invalid timer call
Alexander Alekhin [Thu, 3 Mar 2016 17:25:32 +0000 (17:25 +0000)]
Merge pull request #6199 from alalek:ffmpeg_backport
Alexander Alekhin [Thu, 3 Mar 2016 12:07:16 +0000 (12:07 +0000)]
Merge pull request #6204 from alalek:minor_fix_break
Alexander Alekhin [Thu, 3 Mar 2016 11:23:59 +0000 (14:23 +0300)]
apps: add missed 'break'
Vitaly Tuzov [Thu, 3 Mar 2016 10:38:08 +0000 (13:38 +0300)]
Calibration test temporary disabled
Alexander Alekhin [Wed, 2 Mar 2016 14:54:17 +0000 (17:54 +0300)]
backport ffmpeg fixes
Vitaly Tuzov [Thu, 25 Feb 2016 14:25:24 +0000 (17:25 +0300)]
Added images necessary for tests
Vitaly Tuzov [Thu, 25 Feb 2016 14:06:20 +0000 (17:06 +0300)]
Make some tests less strict due to improvement of related algorithms in master branch
Vitaly Tuzov [Wed, 24 Feb 2016 11:18:51 +0000 (14:18 +0300)]
Backport of new python tests from master branch(PR https://github.com/Itseez/opencv/pull/6025).
At the moment tests requre samples/data copied to source location from master branch.
Alexander Alekhin [Mon, 15 Feb 2016 15:12:48 +0000 (15:12 +0000)]
Merge pull request #6106 from ilya-lavrenov:compilation-warning
Ilya Lavrenov [Thu, 11 Feb 2016 21:33:18 +0000 (00:33 +0300)]
fixed compilation warning
Maksim Shabunin [Mon, 8 Feb 2016 15:32:41 +0000 (15:32 +0000)]
Merge pull request #6083 from alekcac:alekcac-removed-gittip-link-in-2.4
Alexander Shishkov [Mon, 8 Feb 2016 08:07:58 +0000 (11:07 +0300)]
Removed gittip link
This project is dead from the 1st September last year
Alexander Alekhin [Tue, 2 Feb 2016 07:09:20 +0000 (07:09 +0000)]
Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4
atinfinity [Mon, 1 Feb 2016 12:15:28 +0000 (21:15 +0900)]
added cmakedefine to cmake/templates/cvconfig.h.in
atinfinity [Sat, 30 Jan 2016 16:56:45 +0000 (01:56 +0900)]
fixed to use NVCUVID in 'cudacodec' module.
Alexander Alekhin [Sat, 23 Jan 2016 06:41:50 +0000 (06:41 +0000)]
Merge pull request #6006 from mleotta:fix-install-name-dir
Matt Leotta [Thu, 21 Jan 2016 21:07:56 +0000 (16:07 -0500)]
Remove "INSTALL_NAME_DIR lib" target property
The INSTALL_NAME_DIR property of a target specifies how a dynamic library should
be found on OS X. If INSTALL_NAME_DIR is not specified the loader will search
relative to the standard search paths. If specified it should either be
an absolute path or relative path prefixed with either @executable_path,
@load_path, or @rpath. Specifying "lib" does not make sense here and
causes linking error as documented here:
http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library-on-mac-osx/
and here
http://stackoverflow.com/questions/
26978806/dyld-library-not-loaded-lib-libopencv-core-3-0-dylib-reason-image-not-found
This patch removes INSTALL_NAME_DIR everywhere it is set to "lib".
An alternate solution would be to set an absolute path like
"${CMAKE_INSTALL_PREFIX}/lib" or relative path like
"@executable_path/../lib". However, if there is not specific need for
specifying a path, it is probably best left unset.
Alexander Alekhin [Thu, 21 Jan 2016 15:03:46 +0000 (15:03 +0000)]
Merge pull request #6001 from terfendail:pyrsegmentation_valgrind
Alexander Alekhin [Thu, 21 Jan 2016 15:03:31 +0000 (15:03 +0000)]
Merge pull request #5993 from asmorkalov:linitian_signed_packages
Alexander Smorkalov [Wed, 20 Jan 2016 08:58:48 +0000 (11:58 +0300)]
Added lintian overrides for package signature entry.
Vitaly Tuzov [Wed, 20 Jan 2016 16:20:36 +0000 (19:20 +0300)]
Fixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue due to wrong pointer recalculation for zero level of pyramid.
Alexander Alekhin [Thu, 21 Jan 2016 05:16:37 +0000 (05:16 +0000)]
Merge pull request #5995 from alalek:fix_include_opencv_24
Alexander Alekhin [Wed, 20 Jan 2016 15:50:59 +0000 (15:50 +0000)]
Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix
Alexander Alekhin [Wed, 20 Jan 2016 10:06:51 +0000 (13:06 +0300)]
include available modules only
Elena Gvozdeva [Wed, 20 Jan 2016 10:07:07 +0000 (13:07 +0300)]
fix bug on border at pyrUp
Vadim Pisarevsky [Tue, 19 Jan 2016 10:49:56 +0000 (10:49 +0000)]
Merge pull request #5984 from terfendail:2.4
Vitaly Tuzov [Mon, 18 Jan 2016 09:54:53 +0000 (12:54 +0300)]
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.
Alexander Alekhin [Fri, 15 Jan 2016 11:45:10 +0000 (11:45 +0000)]
Merge pull request #5975 from terfendail:2.4
Vitaly Tuzov [Fri, 4 Dec 2015 11:31:24 +0000 (14:31 +0300)]
Update call to Tegra optimized morphology filtering
Alexander Alekhin [Tue, 12 Jan 2016 08:08:58 +0000 (08:08 +0000)]
Merge pull request #5946 from takacsd:patch-1
takacsd [Mon, 11 Jan 2016 15:05:22 +0000 (16:05 +0100)]
Add missing implementation to one of the Mat_<_Tp> constructor. (#5945)
Alexander Alekhin [Mon, 11 Jan 2016 11:12:31 +0000 (11:12 +0000)]
Merge pull request #5942 from akarsakov:fix_memcpy_empty_vector
Alexander Karsakov [Mon, 11 Jan 2016 08:39:18 +0000 (11:39 +0300)]
Fixed pnpTask: don't copy inliers vector in case it's empty.
Alexander Alekhin [Thu, 24 Dec 2015 09:07:29 +0000 (09:07 +0000)]
Merge pull request #5858 from mshabunin:fix-arm-cross-warnings
Alexander Alekhin [Wed, 23 Dec 2015 16:16:56 +0000 (16:16 +0000)]
Merge pull request #5869 from atinfinity:pullreq/151223-FindTBB-VS2015-2.4
atinfinity [Wed, 23 Dec 2015 14:43:01 +0000 (23:43 +0900)]
changed to find TBB library(VS2015)
Alexander Alekhin [Tue, 22 Dec 2015 17:31:19 +0000 (17:31 +0000)]
Merge pull request #5846 from mshabunin:backports-3
Maksim Shabunin [Tue, 22 Dec 2015 12:58:39 +0000 (15:58 +0300)]
Fixed PCH warning during ARM crosscompilation
Maksim Shabunin [Fri, 27 Feb 2015 15:59:55 +0000 (18:59 +0300)]
Backported several changes from master branch:
- #3771 - inline round on ARM
- #5633 - documentation for MSER
- #5666 - run.py fixes
Alexander Smorkalov [Wed, 16 Dec 2015 11:27:59 +0000 (11:27 +0000)]
Merge pull request #5763 from ilya-lavrenov:lintian
Ilya Lavrenov [Mon, 7 Dec 2015 10:21:51 +0000 (13:21 +0300)]
suppress lintian warning in opencv.pc
Vadim Pisarevsky [Mon, 7 Dec 2015 10:08:23 +0000 (10:08 +0000)]
Merge pull request #5733 from teng88:patch-3
Maksim Shabunin [Thu, 3 Dec 2015 07:41:22 +0000 (07:41 +0000)]
Merge pull request #5720 from asmorkalov:as/cuda_qnx
Teng Cao [Wed, 2 Dec 2015 09:31:17 +0000 (17:31 +0800)]
Update cascadeclassifier.cpp
minor fix since predict() returun int
Alexander Smorkalov [Mon, 30 Nov 2015 07:28:04 +0000 (10:28 +0300)]
Build fix for QNX 6.6 neitrino.
Alexander Smorkalov [Thu, 26 Nov 2015 08:20:12 +0000 (08:20 +0000)]
Merge pull request #5713 from ilya-lavrenov:lintian
Ilya Lavrenov [Wed, 25 Nov 2015 20:38:33 +0000 (23:38 +0300)]
added suppression for python-script-but-no-python-dep
Vadim Pisarevsky [Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)]
Merge pull request #5390 from StevenPuttemans:add_markers_2.4