Maksim Shabunin
d1a2c73228
Merge pull request #6090 from alalek:feature_6089
2016-02-15 14:17:15 +00:00
Maksim Shabunin
1aeff45631
Merge pull request #6103 from mshabunin:add-get-samples
2016-02-15 13:11:28 +00:00
Maksim Shabunin
8c29380471
Merge pull request #6105 from mshabunin:tutorial-folder-correction
2016-02-15 13:10:45 +00:00
Maksim Shabunin
28dd315ef3
Merge pull request #6104 from alalek:issue_6102
2016-02-15 09:59:35 +00:00
Alexander Alekhin
84bf7680c7
Merge pull request #6100 from alalek:fix_5934
2016-02-15 02:52:07 +00:00
Maksim Shabunin
6c0c0466c6
Tutorials: moved Megamind.avi files to samples/data folder
2016-02-12 13:44:14 +03:00
Maksim Shabunin
359acc0d33
Tutorials: moved imgcodecs and videoio tutorials to separate pages
2016-02-12 13:35:46 +03:00
Alexander Alekhin
f48cda2f95
test: initialize test data in test_umat.cpp (6102)
2016-02-12 13:15:15 +03:00
Maksim Shabunin
54abb83c82
ml: moved getTestSamples implementation to src
2016-02-12 12:32:26 +03:00
ahb
15793b1301
add TestData::getTestSamples()
2016-02-12 12:11:10 +03:00
Alexander Alekhin
80102b76f9
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
2016-02-11 15:00:52 +00:00
Alexander Alekhin
b2ca10a81f
cmake: fix find_library() for bzip2
2016-02-11 12:57:10 +03:00
Alexander Alekhin
2c4ed7f8a5
Merge pull request #6051 from mshabunin:fix-cap-qtkit
2016-02-10 17:35:20 +00:00
Alexander Alekhin
5efadcb335
Merge pull request #6042 from Dmitry-Me:reduceVariablesScope
2016-02-10 17:33:43 +00:00
Alexander Alekhin
8ac96eecd2
Merge pull request #6073 from alalek:fix_5897
2016-02-10 17:33:12 +00:00
Alexander Alekhin
b529b37d06
Merge pull request #6032 from mzajko:ximea_getprop_update
2016-02-09 12:07:17 +00:00
Alexander Alekhin
9ac35173e3
cmake: remove non-ascii symbols
2016-02-09 14:44:05 +03:00
Alexander Alekhin
1dac67f013
cmake: add version control revision info for extra modules
2016-02-09 14:39:05 +03:00
Alexander Alekhin
de8b3ee231
cmake: add timestamp into build info log (6089)
2016-02-09 14:39:04 +03:00
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.
2016-02-09 10:36:22 +01:00
Alexander Alekhin
e4dc479e95
Merge pull request #6088 from mshabunin:fix-exif-parsing
2016-02-08 16:01:07 +00:00
Alexander Alekhin
afdcfccdae
Merge pull request #6082 from alekcac:alekcac-readme-changes
2016-02-08 15:57:55 +00:00
Maksim Shabunin
7ba9b4fd1a
Merge pull request #6085 from StevenPuttemans:add_at_matrix_info
2016-02-08 15:30:17 +00:00
Maksim Shabunin
112aa49104
ExifReader::getFormat : check buffer length before accessing, fixes 6059
2016-02-08 17:14:55 +03:00
Steven Puttemans
cd96df1407
Update mat.hpp
2016-02-08 13:26:06 +01:00
Steven Puttemans
a70c54f2c5
Added suggestions from PR6068
...
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-180797723
2016-02-08 10:20:08 +01:00
Alexander Shishkov
4f5497837a
Removed gittip link
...
This project is dead from 1st September last year
2016-02-08 11:04:19 +03:00
Alexander Alekhin
f9f5313670
Merge pull request #6075 from pranavg189:master
2016-02-07 09:41:29 +00:00
Pranav Ganorkar
4a5ed70175
removed dirname variable
2016-02-07 03:09:21 +05:30
Alexander Alekhin
c09b6000c6
ffmpeg: compatibility guard for interrupt callback feature
2016-02-06 15:20:36 +03:00
Alexander Alekhin
c10c8db97d
cmake: skip checks for host paths on cross-compilation (5897)
2016-02-06 15:19:28 +03:00
Alexander Alekhin
e04f372083
Merge pull request #6068 from StevenPuttemans:add_at_matrix_info
2016-02-05 14:03:22 +00:00
Alexander Alekhin
0e909aa676
Merge pull request #6067 from StevenPuttemans:adapt_cmake
2016-02-05 12:51:00 +00:00
StevenPuttemans
873399705d
add clarification on the acces paramter of the at operator
2016-02-05 13:21:40 +01:00
StevenPuttemans
6cdf3116c4
deactivate build options by default that are not supposed the be ON by default
2016-02-05 11:01:21 +01:00
Alexander Alekhin
b148ef2b1f
Merge pull request #6053 from peters:master
2016-02-04 19:33:20 +00:00
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.
2016-02-04 18:09:14 +01:00
Alexander Alekhin
b2d44663fd
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
2016-02-04 15:14:02 +00:00
Alexander Alekhin
ea8f9b032f
Merge pull request #6062 from StevenPuttemans:fix_cascade_detect
2016-02-04 14:04:53 +00:00
StevenPuttemans
89df7923a7
revert PR 5362
2016-02-04 13:20:21 +01:00
Vadim Pisarevsky
56c89e0a98
Merge pull request #6014 from alalek:fix_5991
2016-02-04 09:54:27 +00:00
Vadim Pisarevsky
dabce70325
Merge pull request #6057 from alalek:fix_opencl_load_threadsafe
2016-02-04 09:31:36 +00:00
Suleyman TURKMEN
194b865daf
update documentation of cv::repeat
2016-02-03 23:36:30 +02:00
Alexander Alekhin
7e472fbf68
ocl: thread-safe OpenCL loading (6056)
2016-02-03 18:30:40 +03:00
Alexander Alekhin
6f51dd1258
Merge pull request #6009 from patricksnape:flann_python_fix
2016-02-02 16:03:54 +00:00
Maksim Shabunin
a2bda99921
MacOSX / QTKit capture: trying to fix invalid timer call
2016-02-02 14:30:37 +03:00
Alexander Alekhin
35014a9742
Merge pull request #6048 from philippefoubert:ximea_bugfix
2016-02-02 07:25:34 +00:00
Alexander Alekhin
e0baa02193
Merge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid
2016-02-02 07:08:49 +00:00
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).
2016-02-01 19:19:52 +01:00
atinfinity
db6e095fcc
added cmakedefine to cmake/templates/cvconfig.h.in
2016-02-01 20:59:11 +09:00
