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
Maksim Shabunin
681df84036
Merge pull request #5720 from asmorkalov:as/cuda_qnx
2015-12-03 07:41:23 +00:00
Teng Cao
07a58c47cb
Update cascadeclassifier.cpp
...
minor fix since predict() returun int
2015-12-02 17:31:17 +08:00
Alexander Smorkalov
53ed1a8c03
Build fix for QNX 6.6 neitrino.
2015-11-30 10:28:04 +03:00
Alexander Smorkalov
4d598719da
Merge pull request #5713 from ilya-lavrenov:lintian
2015-11-26 08:20:12 +00:00
Ilya Lavrenov
130d4b1bdf
added suppression for python-script-but-no-python-dep
2015-11-25 23:38:44 +03:00
Vadim Pisarevsky
42001234ab
Merge pull request #5390 from StevenPuttemans:add_markers_2.4
2015-11-23 13:40:00 +00:00
Vadim Pisarevsky
6e885e5775
Merge pull request #5682 from ilya-lavrenov:lintian-overrides
2015-11-23 13:38:38 +00:00
Maksim Shabunin
5c0cdd4d2d
Merge pull request #5650 from hoangviet1985:fix_bug_5623
2015-11-20 16:15:47 +00:00
Ilya Lavrenov
969f0c4456
added lintian overrides for debian packages
2015-11-19 17:10:09 +03:00
Maksim Shabunin
739d7caa32
Merge pull request #5659 from jet47:cuda-wrap-stream-2.4
2015-11-19 09:25:36 +00:00
Maksim Shabunin
6148c3525e
Merge pull request #5672 from ilya-lavrenov:npp-graphcut
2015-11-19 09:18:23 +00:00
Vadim Pisarevsky
df55aaec1e
Merge pull request #5674 from mshabunin:mac-fix-2.4
2015-11-17 17:30:08 +00:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Ilya Lavrenov
0050df8750
GraphCut deprecated in 7.5 and removed in 8.0
2015-11-15 00:56:56 +03:00
Maksim Shabunin
01b5971c94
Merge pull request #5640 from mshabunin:restore-ts-gpu
2015-11-13 15:47:17 +00:00
Vladislav Vinogradov
8d3850ac02
add cv::gpu::StreamAccessor::wrapStream method
...
it allows to import existed CUDA stream to OpenCV
2015-11-12 13:07:30 +03:00
Alexander Alekhin
1862d1995f
Merge pull request #5652 from jet47:core-test-math-warning-fix
2015-11-12 03:10:46 +00:00
Alexander Alekhin
fc1694c97c
Merge pull request #5655 from janstarzy:2.4-canny-fix
2015-11-12 03:10:11 +00:00
Jan Starzynski
2799829bc9
fix potential buffer overflow as in 3.0
2015-11-11 16:19:20 +01:00
Vladislav Vinogradov
d5e6503fe5
fix signed/unsigned comparison warning in core/test/test_math.cpp
2015-11-11 11:53:39 +03:00
hoangviet1985
6441620f45
The right signs give the right results
2015-11-10 16:18:07 -05:00
Vadim Pisarevsky
0f288d1082
Merge pull request #5605 from hoangviet1985:fix_bug_5599
2015-11-10 16:13:26 +00:00
Vadim Pisarevsky
82c1c68560
Merge pull request #5622 from LorenaGdL:hitAndMiss2.4
2015-11-10 16:03:48 +00:00
