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
Alexander Alekhin
85793d0138
Merge pull request #6001 from terfendail:pyrsegmentation_valgrind
2016-01-21 15:03:46 +00:00
Alexander Alekhin
a57b03c356
Merge pull request #5993 from asmorkalov:linitian_signed_packages
2016-01-21 15:03:31 +00:00
Alexander Smorkalov
5a5378b3bf
Added lintian overrides for package signature entry.
2016-01-21 17:04:28 +03:00
Vitaly Tuzov
f01f1bc5e6
Fixed "Conditional jump or move depends on uninitialised value(s)" valgrind issue due to wrong pointer recalculation for zero level of pyramid.
2016-01-21 12:54:08 +03:00
Alexander Alekhin
85c7190e41
Merge pull request #5995 from alalek:fix_include_opencv_24
2016-01-21 05:16:37 +00:00
Alexander Alekhin
f2e4bec925
Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix
2016-01-20 15:50:59 +00:00
Alexander Alekhin
4a8d1147c2
include available modules only
2016-01-20 13:14:20 +03:00
Elena Gvozdeva
bb1c2d71a8
fix bug on border at pyrUp
2016-01-20 13:07:07 +03:00
Vadim Pisarevsky
be565c2235
Merge pull request #5984 from terfendail:2.4
2016-01-19 10:49:56 +00:00
Vitaly Tuzov
389f176a67
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.
2016-01-18 12:54:53 +03:00
Alexander Alekhin
5c21ca2697
Merge pull request #5975 from terfendail:2.4
2016-01-15 11:45:10 +00:00
Vitaly Tuzov
4f5d585184
Update call to Tegra optimized morphology filtering
2016-01-15 11:48:29 +03:00
Alexander Alekhin
c01fd16291
Merge pull request #5946 from takacsd:patch-1
2016-01-12 08:08:58 +00:00
takacsd
537d1322b4
Add missing implementation to one of the Mat_<_Tp> constructor. ( #5945 )
2016-01-11 16:05:22 +01:00
Alexander Alekhin
8a803865cf
Merge pull request #5942 from akarsakov:fix_memcpy_empty_vector
2016-01-11 11:12:31 +00:00
Alexander Karsakov
6e22020dad
Fixed pnpTask: don't copy inliers vector in case it's empty.
2016-01-11 11:39:18 +03:00
Alexander Alekhin
f91ada572a
Merge pull request #5858 from mshabunin:fix-arm-cross-warnings
2015-12-24 09:07:29 +00:00
Alexander Alekhin
f7c8f74ac1
Merge pull request #5869 from atinfinity:pullreq/151223-FindTBB-VS2015-2.4
2015-12-23 16:16:57 +00:00
atinfinity
c4e80952ce
changed to find TBB library(VS2015)
2015-12-23 23:43:01 +09:00
Alexander Alekhin
178ed63e1a
Merge pull request #5846 from mshabunin:backports-3
2015-12-22 17:31:20 +00:00
Maksim Shabunin
46edb54ac3
Fixed PCH warning during ARM crosscompilation
2015-12-22 15:58:39 +03:00
Maksim Shabunin
7cb78451d1
Backported several changes from master branch:
...
- #3771 - inline round on ARM
- #5633 - documentation for MSER
- #5666 - run.py fixes
2015-12-21 18:20:37 +03:00
Alexander Smorkalov
2897da037e
Merge pull request #5763 from ilya-lavrenov:lintian
2015-12-16 11:27:59 +00:00
Ilya Lavrenov
4fa14f75b8
suppress lintian warning in opencv.pc
2015-12-09 13:47:09 +03:00
Vadim Pisarevsky
0886f6fe62
Merge pull request #5733 from teng88:patch-3
2015-12-07 10:08:23 +00:00
