Alexander Alekhin
e04f372083
Merge pull request #6068 from StevenPuttemans:add_at_matrix_info
9 years ago
Alexander Alekhin
0e909aa676
Merge pull request #6067 from StevenPuttemans:adapt_cmake
9 years ago
StevenPuttemans
873399705d
add clarification on the acces paramter of the at operator
9 years ago
StevenPuttemans
6cdf3116c4
deactivate build options by default that are not supposed the be ON by default
9 years ago
Alexander Alekhin
b148ef2b1f
Merge pull request #6053 from peters:master
9 years ago
Peter Rekdal Sunde
da48061910
Add interrupt callback with default timeout of 30s. Fixes #5730 .
...
Fix docs build failure by re-indenting with spaces instead of tabs.
Trailing whitespace fixes. http://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/5152/steps/whitespace/logs/stdio
mingw build fix.
9 years ago
Alexander Alekhin
b2d44663fd
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
9 years ago
Alexander Alekhin
ea8f9b032f
Merge pull request #6062 from StevenPuttemans:fix_cascade_detect
9 years ago
StevenPuttemans
89df7923a7
revert PR 5362
9 years ago
Vadim Pisarevsky
56c89e0a98
Merge pull request #6014 from alalek:fix_5991
9 years ago
Vadim Pisarevsky
dabce70325
Merge pull request #6057 from alalek:fix_opencl_load_threadsafe
9 years ago
Suleyman TURKMEN
194b865daf
update documentation of cv::repeat
9 years ago
Alexander Alekhin
7e472fbf68
ocl: thread-safe OpenCL loading (6056)
9 years ago
Alexander Alekhin
6f51dd1258
Merge pull request #6009 from patricksnape:flann_python_fix
9 years ago
Maksim Shabunin
a2bda99921
MacOSX / QTKit capture: trying to fix invalid timer call
9 years ago
Alexander Alekhin
35014a9742
Merge pull request #6048 from philippefoubert:ximea_bugfix
9 years ago
Alexander Alekhin
d6e2097435
Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4
9 years ago
Alexander Alekhin
e0baa02193
Merge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid
9 years ago
Philippe FOUBERT
43a1874e33
Bug correction:
...
The "CvCaptureCAM_XIMEA::getProperty" method had not the same signature as "CvCapture::getProperty" so it was not called when we use the "VideoCapture::get" method (the "const" specifier was missing).
9 years ago
atinfinity
cf43790a27
added cmakedefine to cmake/templates/cvconfig.h.in
9 years ago
atinfinity
db6e095fcc
added cmakedefine to cmake/templates/cvconfig.h.in
9 years ago
Dmitry-Me
bf604f1780
Reduce variables scope
9 years ago
atinfinity
69eaa89e22
fixed to use NVCUVID in 'cudacodec' module.
9 years ago
atinfinity
ed8368fed7
fixed to use NVCUVID in 'cudacodec' module.
9 years ago
Alexander Alekhin
a4692a0da5
Merge pull request #6035 from ogreen:master
9 years ago
Oded Green
1a0282df21
CUDA median filtering using histograms
9 years ago
Alexander Alekhin
4894aac50d
Merge pull request #6012 from mzajko:xi_cmake_update
9 years ago
Alexander Alekhin
2978a16c85
core: preserve sizes values ( fixes #5991 )
...
_sizes can point to internal structure which is destroyed
by release() call
9 years ago
Alexander Alekhin
96f5a930f4
test: regression 5991
9 years ago
Marian Zajko
a387d6fa26
- removed whitespaces
9 years ago
Marian Zajko
34c006fcc4
Fixed ximea cmake settings
...
Fixed ximea cmake settings for 32bit win build and linux.
9 years ago
Patrick Snape
05cfe28612
Fix parsing of training vecs for FlannBasedMatcher
...
FlannBasedMatcher::add is overloaded, but the style of parsing the
InputArrayOfArrays does not match the style from
DescriptorMatcher::add. The issue is that InputArrayOfArrays
must be properly marshalled so that the data can be read
correctly. In this case, the method expects the training
descriptors to be either a vector of matrices or a single matrix
(as is shown in DescriptorMatcher::add). These code
replicates that for the case of the FlannBasedMatcher::add.
In fact, a similar commit to this was added by 26d9a7c
but was
ultimately not accepted in #4111 . This is likely due to the
fact that the input arrays were not parsed properly and the
case of a single matrix was being improperly handled. I believe
this commit to be correct given the logic from
DescriptorMatcher::add.
9 years ago
Patrick Snape
2f5ea3437e
Update indentation to match rest of file
...
Very cosmetic, but was analyzing code and just wanted to make it
consistent.
9 years ago
Amro
c35b00a97e
fix code snippet showing how to use SparseMat
...
generate indices within the size limit (modulo)
9 years ago
Alexander Alekhin
e835878661
Merge pull request #6006 from mleotta:fix-install-name-dir
9 years ago
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.
9 years ago
Alexander Alekhin
85793d0138
Merge pull request #6001 from terfendail:pyrsegmentation_valgrind
9 years ago
Alexander Alekhin
a57b03c356
Merge pull request #5993 from asmorkalov:linitian_signed_packages
9 years ago
Alexander Smorkalov
5a5378b3bf
Added lintian overrides for package signature entry.
9 years ago
Maksim Shabunin
1cd3c6f364
Merge pull request #6000 from alalek:fix_python_detection
9 years ago
Alexander Alekhin
c5531a7a2f
Merge pull request #5985 from Entodi:patch-1
9 years ago
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.
9 years ago
Alexander Alekhin
75b709328e
Merge pull request #5994 from alalek:fix_include_opencv
9 years ago
Alexander Alekhin
85c7190e41
Merge pull request #5995 from alalek:fix_include_opencv_24
9 years ago
Alexander Alekhin
5c8907c0e1
Merge pull request #5992 from ejoebstl:master
9 years ago
Alexander Alekhin
9bee835dac
cmake: fix python detection
9 years ago
Alexander Alekhin
f2e4bec925
Merge pull request #5996 from ElenaGvozdeva:pyrUp_fix
9 years ago
emiswelt
b6c5936704
Removed trailing whitespace.
...
Note: Force push to force a re-run of build tests. The previous tests
failed in an unrelated module. I assume it's a bug that occured
randomly.
9 years ago
Alexander Alekhin
4a8d1147c2
include available modules only
9 years ago
Alexander Alekhin
24bbdeb0c8
include available modules only
9 years ago