Maksim Shabunin
70bc268c1a
Fixed problem with nonfree python test: could not find local test images
2016-04-11 18:45:14 +03:00
Alexander Alekhin
52ba3778e3
Merge pull request #6363 from alalek:ffmpeg_fix_timeout_24
2016-04-05 16:29:15 +00:00
Alexander Alekhin
c7b6353a3c
Merge pull request #6365 from terfendail:vt/nonlocal_testdata
2016-04-05 15:25:15 +00:00
Vitaly Tuzov
34b3d31f54
Fix for nonlocal data requirement in test2.py
2016-04-05 16:47:29 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Alexander Alekhin
86a725933a
Merge pull request #6343 from terfendail:vt/python_rng_seed_backport
2016-03-29 16:06:27 +00:00
Vitaly Tuzov
64f02aa72d
Backport of setRNGSeed implementation and python test randomness fix
2016-03-29 18:05:28 +03:00
Alexander Alekhin
12a8f5486d
Merge pull request #6341 from SpecLad:destroy-leak
2016-03-29 12:36:51 +00:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Alexander Smorkalov
762965897a
Merge pull request #6320 from terfendail:vt/pytestarm64
2016-03-24 17:16:52 +00:00
Vitaly Tuzov
ea3746bd15
Made texture flow python test less strict to fix it on AARCH64
2016-03-23 20:07:42 +03:00
Alexander Smorkalov
ef2a376baf
Merge pull request #6297 from terfendail:vt/pytestarm
2016-03-21 15:01:04 +00:00
Maksim Shabunin
dc8bb23a7d
Merge pull request #6287 from StevenPuttemans:add_num_features_info_2.4
2016-03-21 14:09:21 +00:00
Vitaly Tuzov
24361733e4
Fixed face detection python test
2016-03-18 17:44:45 +03:00
StevenPuttemans
b5fbb2b1c8
add cascade classifier info - total number of unique features passed to boosting process
2016-03-17 13:33:11 +01:00
Alexander Smorkalov
b8ce65bec8
Merge pull request #6279 from terfendail:vt/pythontest_data
2016-03-17 12:27:12 +00:00
Vitaly Tuzov
96903dc4ad
Test data necessary for python samples added to test package.
...
Test launch script updated to run new tests as well.
2016-03-17 11:38:40 +03:00
Alexander Smorkalov
da669569e1
Merge pull request #6281 from SpecLad:videowriter-oob
2016-03-17 08:09:13 +00:00
Roman Donchenko
eb40afa26a
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.
2016-03-16 20:04:33 +03:00
Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Alexander Smorkalov
d142c05d61
Merge pull request #6276 from SpecLad:bp-3813
2016-03-16 11:41:27 +00:00
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
Alexander Alekhin
9d49cef29e
Merge pull request #6245 from delftswa2016:fix-for-issue-4375
2016-03-14 11:26:33 +00:00
shruthikashyap
1fbc6ab05d
Adding the syntax and usage for cv2.undistortPoints().
2016-03-13 13:32:24 +01:00
Vadim Pisarevsky
93c4dfb16d
Merge pull request #6236 from alalek:backport_6232
2016-03-12 16:38:56 +00:00
Alexander Alekhin
52b9207105
Merge pull request #6237 from mshabunin:fix-vtk-on-2.4
2016-03-11 14:20:16 +00:00
Maksim Shabunin
d2e451e877
Ported VTK cmake detection from master branch
2016-03-11 16:25:47 +03:00
Piotr Semenov
00e91fd3d0
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
2016-03-11 15:20:36 +03:00
Alexander Alekhin
afc62f076a
Merge pull request #6234 from asmorkalov:as/deb_version_check
2016-03-11 10:06:25 +00:00
Alexander Smorkalov
9c4204b89e
Added check if debian package version matches version from version.hpp
2016-03-11 11:59:15 +03:00
Maksim Shabunin
3afb5a6006
Merge pull request #6171 from terfendail:vt/new_python_tests_backport
2016-03-10 09:09:32 +00:00
Maksim Shabunin
7e44faf635
Merge pull request #6228 from wangguoqin1001:2.4
2016-03-10 08:10:19 +00:00
WANG Guoqin
8cfc87cf01
MacOSX / QTKit capture: trying to fix invalid timer call
2016-03-10 02:49:10 +08:00
Alexander Alekhin
ea049e147d
Merge pull request #6199 from alalek:ffmpeg_backport
2016-03-03 17:25:33 +00:00
Alexander Alekhin
60f73eee7e
Merge pull request #6204 from alalek:minor_fix_break
2016-03-03 12:07:16 +00:00
Alexander Alekhin
c1f3c41bab
apps: add missed 'break'
2016-03-03 14:23:59 +03:00
Vitaly Tuzov
d29eb2938c
Calibration test temporary disabled
2016-03-03 13:38:08 +03:00
Alexander Alekhin
a61b19b524
backport ffmpeg fixes
2016-03-02 18:42:53 +03:00
Vitaly Tuzov
25b4d8a1b5
Added images necessary for tests
2016-02-26 12:42:35 +03:00
Vitaly Tuzov
aaa30dc5b6
Make some tests less strict due to improvement of related algorithms in master branch
2016-02-26 12:42:35 +03:00
Vitaly Tuzov
e0f426f78b
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.
2016-02-26 12:42:18 +03:00
Alexander Alekhin
8a09d95eab
Merge pull request #6106 from ilya-lavrenov:compilation-warning
2016-02-15 15:12:49 +00:00
Ilya Lavrenov
068769263e
fixed compilation warning
2016-02-12 18:12:20 +03:00
Maksim Shabunin
21e9edd1a3
Merge pull request #6083 from alekcac:alekcac-removed-gittip-link-in-2.4
2016-02-08 15:32:41 +00:00
Alexander Shishkov
544824ffc1
Removed gittip link
...
This project is dead from the 1st September last year
2016-02-08 11:07:58 +03:00
Alexander Alekhin
d6e2097435
Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4
2016-02-02 07:09:20 +00:00
atinfinity
cf43790a27
added cmakedefine to cmake/templates/cvconfig.h.in
2016-02-01 21:15:28 +09:00
atinfinity
69eaa89e22
fixed to use NVCUVID in 'cudacodec' module.
2016-01-31 01:56:45 +09:00
Alexander Alekhin
e835878661
Merge pull request #6006 from mleotta:fix-install-name-dir
2016-01-23 06:41:51 +00:00
Matt Leotta
912592de4c
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.
2016-01-21 16:07:56 -05:00
