Alexander Alekhin
87bbaa2c27
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
9 years ago
Alexander Alekhin
2c4ed7f8a5
Merge pull request #6051 from mshabunin:fix-cap-qtkit
9 years ago
Alexander Alekhin
5efadcb335
Merge pull request #6042 from Dmitry-Me:reduceVariablesScope
9 years ago
Alexander Alekhin
8ac96eecd2
Merge pull request #6073 from alalek:fix_5897
9 years ago
Alexander Alekhin
b529b37d06
Merge pull request #6032 from mzajko:ximea_getprop_update
9 years ago
Alexander Alekhin
9ac35173e3
cmake: remove non-ascii symbols
9 years ago
Alexander Alekhin
1dac67f013
cmake: add version control revision info for extra modules
9 years ago
Alexander Alekhin
de8b3ee231
cmake: add timestamp into build info log (6089)
9 years ago
Marian Zajko
c21657336b
ximea interface update
...
- fixed getProperty call definition
- added new parameter defitions
removed whitespaces
Reworked enumerators to keep values from previous commit
ximea enums fixes
- fixed whitespaces issue
- fixed duplicate enum values error
ximea enum definitions update
- fixed videioio.hpp code style
- fixed ABI violation in enums
- added new parameter handlers to cpp
XIMEA setProperty update
Added acquisition resetting to buffer size adjustment parameters.
9 years ago
Alexander Alekhin
e4dc479e95
Merge pull request #6088 from mshabunin:fix-exif-parsing
9 years ago
Alexander Alekhin
afdcfccdae
Merge pull request #6082 from alekcac:alekcac-readme-changes
9 years ago
Maksim Shabunin
7ba9b4fd1a
Merge pull request #6085 from StevenPuttemans:add_at_matrix_info
9 years ago
Maksim Shabunin
112aa49104
ExifReader::getFormat : check buffer length before accessing, fixes 6059
9 years ago
Steven Puttemans
cd96df1407
Update mat.hpp
9 years ago
Steven Puttemans
a70c54f2c5
Added suggestions from PR6068
...
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-180797723
9 years ago
Alexander Shishkov
4f5497837a
Removed gittip link
...
This project is dead from 1st September last year
9 years ago
Alexander Alekhin
f9f5313670
Merge pull request #6075 from pranavg189:master
9 years ago
Pranav Ganorkar
4a5ed70175
removed dirname variable
9 years ago
Alexander Alekhin
c09b6000c6
ffmpeg: compatibility guard for interrupt callback feature
9 years ago
Alexander Alekhin
c10c8db97d
cmake: skip checks for host paths on cross-compilation (5897)
9 years ago
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
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
db6e095fcc
added cmakedefine to cmake/templates/cvconfig.h.in
9 years ago
Dmitry-Me
bf604f1780
Reduce variables scope
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