Jason von Nieda
f4b502dd03
Adds supports for the majority of features2d to the Java wrappers:
...
* Adds the main features2d header to the parse list for the generator.
* Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
* Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.
2016-03-07 00:14:53 -08:00
aravind
dccbf50059
Fixed VS 2010 and option Za bug.
2016-03-03 18:01:05 +05:30
Alexander Alekhin
88a33a4e4f
Merge pull request #6201 from paroj:gst_noconvert
2016-03-03 11:36:05 +00:00
Pavel Rojtberg
ff77f4d9ef
GStreamer: allow reading raw MJPEG data
2016-03-02 17:31:20 +01:00
Alexander Alekhin
bc6ed1467b
Merge pull request #6193 from trombipeti:Fix_#6192
2016-03-02 15:19:01 +00:00
Vadim Pisarevsky
7f4a1bcac7
Merge pull request #6160 from paroj:fe_distort
2016-03-02 13:34:32 +00:00
Vadim Pisarevsky
77f54e0f3e
Merge pull request #6161 from mshabunin:fix-mac-sliders
2016-03-02 13:33:45 +00:00
Elad Joseph
238b47dfce
Added param documentation
...
Added param description to remove doxygen warning
2016-03-02 08:55:53 +02:00
Elad Joseph
2234016a22
Added Subdiv2D class documentation
...
Added documentation to the Subdiv2D documentation, based on the previous
C API.
2016-03-01 23:08:48 +02:00
Péter Trombitás
410eb30c26
Fix for #6192 (Mismatching delete)
2016-03-01 21:40:05 +01:00
Alexander Alekhin
318671d9b5
Merge pull request #6148 from Aravind-Suresh:cv-cuda-reduce-bug-fix
2016-02-29 19:07:05 +00:00
aravind
f4f1561781
Fixed cv::cuda::reduce bug.
2016-02-27 08:30:10 +05:30
Alexander Alekhin
d2e5f90f32
cmake: fix cv2.lib conflict for python2/3 bindings (MSVS)
2016-02-26 17:08:07 +03:00
Alexander Alekhin
81f21e6e6c
Merge pull request #6139 from ioxp:master
2016-02-25 11:41:49 +00:00
Maksim Shabunin
3a92371b60
EXIF reader: fixed file descriptor leak in case of broken tags
2016-02-25 12:19:11 +03:00
Maksim Shabunin
3cc234588a
Added build warnings in case of macro definition conflicts
2016-02-25 11:51:02 +03:00
Maksim Shabunin
ee2f8d006f
Cocoa backend: added checks before accessing sliders dictionary
2016-02-25 11:51:01 +03:00
Pavel Rojtberg
bb605279b6
clarify how to use fisheye::distortPoints
2016-02-24 16:18:13 +01:00
aravind
7ad849718c
Fixed Fisheye Camera model documentation.
2016-02-19 01:17:39 +05:30
Philipp Hasper
3f1eeba39d
findHomography sets output mask to all zeros in case of no inlier
2016-02-18 17:58:28 +01:00
Marian Zajko
e55a053d71
ximea new param
...
- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter
- added acquisition resetting for paramters that require it
2016-02-17 11:18:49 +01:00
Alexander Alekhin
2549bafe4f
Merge pull request #6121 from mshabunin:fix-check-imencode-exif
2016-02-17 00:45:49 +00:00
Maksim Shabunin
03d6d2041a
Merge pull request #6113 from rahulchhabra07:patch-1
2016-02-16 09:04:38 +00:00
Maksim Shabunin
a54870aace
Added filename emptyness check to the Exif reader, fixes 6120
2016-02-16 11:37:36 +03:00
Alexander Alekhin
8c591ebd77
Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052
2016-02-16 07:10:02 +00:00
Maksim Shabunin
1aeff45631
Merge pull request #6103 from mshabunin:add-get-samples
2016-02-15 13:11:28 +00:00
Rahul Chhabra
232f564011
Update imgproc.hpp
...
In reference to Issue #6110 , the order of markerType and color is changed.
2016-02-14 10:18:14 +05:30
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
c7bdbef504
ocl: fix OpenGL sharing detection (6052)
...
Apple OpenCL framework hasn't OpenGL sharing extension
2016-02-11 12:46:22 +03:00
Alexander Alekhin
87bbaa2c27
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
2016-02-11 12:44:45 +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
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
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 Alekhin
c09b6000c6
ffmpeg: compatibility guard for interrupt callback feature
2016-02-06 15:20:36 +03:00
StevenPuttemans
873399705d
add clarification on the acces paramter of the at operator
2016-02-05 13:21:40 +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
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
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