Commit Graph

18641 Commits

Author SHA1 Message Date
Philip
7ff93600b8 Create a Pull Request template
In addition to the Issue template which is far more important i would like to add this so issues will get closed after merging related PRs rather than being reliant on the reviewer.
If someone want to add something here feel free.
2016-02-19 14:29:59 +01:00
Alexander Alekhin
177aef05b6 Merge pull request #6141 from Aravind-Suresh:fisheye-documentation-fix 2016-02-19 07:29:19 +00:00
aravind
7ad849718c Fixed Fisheye Camera model documentation. 2016-02-19 01:17:39 +05:30
Alexander Alekhin
46662ccd99 Merge pull request #6136 from mbarnach:6135-Fix-upperbody_xml_in_cuda 2016-02-18 13:20:45 +00:00
Mathieu Barnachon
9a44e92193 Fix the missing - in file. 2016-02-18 11:28:41 +01:00
Alexander Alekhin
06ea7094f5 Merge pull request #6129 from mzajko:xi_new_param 2016-02-17 15:47:59 +00: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
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
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
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
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
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