aravind [Thu, 3 Mar 2016 12:12:47 +0000 (17:42 +0530)]
Fixed VS 2010 and option Za bug.
Alexander Alekhin [Thu, 3 Mar 2016 11:36:05 +0000 (11:36 +0000)]
Merge pull request #6201 from paroj:gst_noconvert
Pavel Rojtberg [Wed, 2 Mar 2016 16:22:49 +0000 (17:22 +0100)]
GStreamer: allow reading raw MJPEG data
Alexander Alekhin [Wed, 2 Mar 2016 15:19:01 +0000 (15:19 +0000)]
Merge pull request #6193 from trombipeti:Fix_#6192
Vadim Pisarevsky [Wed, 2 Mar 2016 13:34:32 +0000 (13:34 +0000)]
Merge pull request #6160 from paroj:fe_distort
Vadim Pisarevsky [Wed, 2 Mar 2016 13:33:45 +0000 (13:33 +0000)]
Merge pull request #6161 from mshabunin:fix-mac-sliders
Vadim Pisarevsky [Wed, 2 Mar 2016 13:31:43 +0000 (13:31 +0000)]
Merge pull request #6194 from eladj:subdiv2d_documentation
Elad Joseph [Wed, 2 Mar 2016 06:55:53 +0000 (08:55 +0200)]
Added param documentation
Added param description to remove doxygen warning
Elad Joseph [Tue, 1 Mar 2016 21:08:48 +0000 (23:08 +0200)]
Added Subdiv2D class documentation
Added documentation to the Subdiv2D documentation, based on the previous
C API.
Péter Trombitás [Tue, 1 Mar 2016 20:40:05 +0000 (21:40 +0100)]
Fix for #6192 (Mismatching delete)
Alexander Alekhin [Tue, 1 Mar 2016 14:05:42 +0000 (14:05 +0000)]
Merge pull request #6190 from berak:fix_ml_python_tutorial
berak [Mon, 29 Feb 2016 21:26:13 +0000 (22:26 +0100)]
fix python ml tutorials
Elad Joseph [Mon, 29 Feb 2016 19:48:30 +0000 (21:48 +0200)]
Merge remote-tracking branch 'refs/remotes/Itseez/master'
Alexander Alekhin [Mon, 29 Feb 2016 19:07:05 +0000 (19:07 +0000)]
Merge pull request #6148 from Aravind-Suresh:cv-cuda-reduce-bug-fix
Alexander Alekhin [Mon, 29 Feb 2016 15:13:39 +0000 (15:13 +0000)]
Merge pull request #6181 from delftswa2016:fix-for-issue-6146
Alexander Alekhin [Mon, 29 Feb 2016 11:51:34 +0000 (11:51 +0000)]
Merge pull request #6174 from alalek:fix_python_msvs
shruthikashyap [Sat, 27 Feb 2016 22:26:23 +0000 (23:26 +0100)]
Fix for issue 6146 and some grammar corrections
shruthikashyap [Sat, 27 Feb 2016 22:16:52 +0000 (23:16 +0100)]
Fix for issue 6146
aravind [Fri, 26 Feb 2016 10:14:20 +0000 (15:44 +0530)]
Fixed cv::cuda::reduce bug.
Alexander Alekhin [Fri, 26 Feb 2016 14:08:07 +0000 (17:08 +0300)]
cmake: fix cv2.lib conflict for python2/3 bindings (MSVS)
Alexander Alekhin [Thu, 25 Feb 2016 11:41:49 +0000 (11:41 +0000)]
Merge pull request #6139 from ioxp:master
Alexander Alekhin [Thu, 25 Feb 2016 11:11:28 +0000 (11:11 +0000)]
Merge pull request #6166 from mshabunin:fix-exif-fds-leak
Maksim Shabunin [Thu, 25 Feb 2016 09:19:11 +0000 (12:19 +0300)]
EXIF reader: fixed file descriptor leak in case of broken tags
Maksim Shabunin [Thu, 25 Feb 2016 08:04:23 +0000 (11:04 +0300)]
Added build warnings in case of macro definition conflicts
Maksim Shabunin [Wed, 24 Feb 2016 16:40:50 +0000 (19:40 +0300)]
Cocoa backend: added checks before accessing sliders dictionary
Pavel Rojtberg [Wed, 24 Feb 2016 14:44:32 +0000 (15:44 +0100)]
clarify how to use fisheye::distortPoints
Alexander Alekhin [Fri, 19 Feb 2016 07:29:18 +0000 (07:29 +0000)]
Merge pull request #6141 from Aravind-Suresh:fisheye-documentation-fix
aravind [Wed, 17 Feb 2016 16:27:11 +0000 (21:57 +0530)]
Fixed Fisheye Camera model documentation.
Philipp Hasper [Thu, 18 Feb 2016 16:58:28 +0000 (17:58 +0100)]
findHomography sets output mask to all zeros in case of no inlier
Alexander Alekhin [Thu, 18 Feb 2016 13:20:45 +0000 (13:20 +0000)]
Merge pull request #6136 from mbarnach:6135-Fix-upperbody_xml_in_cuda
Mathieu Barnachon [Thu, 18 Feb 2016 10:28:41 +0000 (11:28 +0100)]
Fix the missing - in file.
Alexander Alekhin [Wed, 17 Feb 2016 15:47:59 +0000 (15:47 +0000)]
Merge pull request #6129 from mzajko:xi_new_param
Marian Zajko [Wed, 17 Feb 2016 10:18:49 +0000 (11:18 +0100)]
ximea new param
- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter
- added acquisition resetting for paramters that require it
Alexander Alekhin [Wed, 17 Feb 2016 00:45:49 +0000 (00:45 +0000)]
Merge pull request #6121 from mshabunin:fix-check-imencode-exif
Maksim Shabunin [Tue, 16 Feb 2016 09:04:38 +0000 (09:04 +0000)]
Merge pull request #6113 from rahulchhabra07:patch-1
Maksim Shabunin [Tue, 16 Feb 2016 08:37:27 +0000 (11:37 +0300)]
Added filename emptyness check to the Exif reader, fixes 6120
Alexander Alekhin [Tue, 16 Feb 2016 07:10:01 +0000 (07:10 +0000)]
Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052
Maksim Shabunin [Mon, 15 Feb 2016 14:17:14 +0000 (14:17 +0000)]
Merge pull request #6090 from alalek:feature_6089
Maksim Shabunin [Mon, 15 Feb 2016 13:11:28 +0000 (13:11 +0000)]
Merge pull request #6103 from mshabunin:add-get-samples
Maksim Shabunin [Mon, 15 Feb 2016 13:10:44 +0000 (13:10 +0000)]
Merge pull request #6105 from mshabunin:tutorial-folder-correction
Maksim Shabunin [Mon, 15 Feb 2016 09:59:35 +0000 (09:59 +0000)]
Merge pull request #6104 from alalek:issue_6102
Alexander Alekhin [Mon, 15 Feb 2016 02:52:07 +0000 (02:52 +0000)]
Merge pull request #6100 from alalek:fix_5934
Rahul Chhabra [Sun, 14 Feb 2016 04:48:14 +0000 (10:18 +0530)]
Update imgproc.hpp
In reference to Issue #6110, the order of markerType and color is changed.
Maksim Shabunin [Fri, 12 Feb 2016 10:42:44 +0000 (13:42 +0300)]
Tutorials: moved Megamind.avi files to samples/data folder
Maksim Shabunin [Fri, 12 Feb 2016 10:35:46 +0000 (13:35 +0300)]
Tutorials: moved imgcodecs and videoio tutorials to separate pages
Alexander Alekhin [Fri, 12 Feb 2016 10:15:15 +0000 (13:15 +0300)]
test: initialize test data in test_umat.cpp (6102)
Maksim Shabunin [Fri, 12 Feb 2016 09:32:26 +0000 (12:32 +0300)]
ml: moved getTestSamples implementation to src
ahb [Sat, 5 Dec 2015 11:48:02 +0000 (12:48 +0100)]
add TestData::getTestSamples()
Alexander Alekhin [Thu, 11 Feb 2016 15:00:52 +0000 (15:00 +0000)]
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
Alexander Alekhin [Thu, 11 Feb 2016 09:57:10 +0000 (12:57 +0300)]
cmake: fix find_library() for bzip2
Alexander Alekhin [Thu, 4 Feb 2016 09:04:04 +0000 (12:04 +0300)]
ocl: fix OpenGL sharing detection (6052)
Apple OpenCL framework hasn't OpenGL sharing extension
Alexander Alekhin [Thu, 4 Feb 2016 08:55:00 +0000 (11:55 +0300)]
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
Alexander Alekhin [Wed, 10 Feb 2016 17:35:20 +0000 (17:35 +0000)]
Merge pull request #6051 from mshabunin:fix-cap-qtkit
Alexander Alekhin [Wed, 10 Feb 2016 17:33:43 +0000 (17:33 +0000)]
Merge pull request #6042 from Dmitry-Me:reduceVariablesScope
Alexander Alekhin [Wed, 10 Feb 2016 17:33:12 +0000 (17:33 +0000)]
Merge pull request #6073 from alalek:fix_5897
Alexander Alekhin [Tue, 9 Feb 2016 12:07:16 +0000 (12:07 +0000)]
Merge pull request #6032 from mzajko:ximea_getprop_update
Alexander Alekhin [Tue, 9 Feb 2016 11:44:05 +0000 (14:44 +0300)]
cmake: remove non-ascii symbols
Alexander Alekhin [Tue, 9 Feb 2016 11:36:42 +0000 (14:36 +0300)]
cmake: add version control revision info for extra modules
Alexander Alekhin [Tue, 9 Feb 2016 11:24:56 +0000 (14:24 +0300)]
cmake: add timestamp into build info log (6089)
Marian Zajko [Fri, 29 Jan 2016 13:55:22 +0000 (14:55 +0100)]
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.
Alexander Alekhin [Mon, 8 Feb 2016 16:01:07 +0000 (16:01 +0000)]
Merge pull request #6088 from mshabunin:fix-exif-parsing
Alexander Alekhin [Mon, 8 Feb 2016 15:57:54 +0000 (15:57 +0000)]
Merge pull request #6082 from alekcac:alekcac-readme-changes
Maksim Shabunin [Mon, 8 Feb 2016 15:30:17 +0000 (15:30 +0000)]
Merge pull request #6085 from StevenPuttemans:add_at_matrix_info
Maksim Shabunin [Mon, 8 Feb 2016 14:11:35 +0000 (17:11 +0300)]
ExifReader::getFormat : check buffer length before accessing, fixes 6059
Steven Puttemans [Mon, 8 Feb 2016 12:26:06 +0000 (13:26 +0100)]
Update mat.hpp
Steven Puttemans [Mon, 8 Feb 2016 09:20:08 +0000 (10:20 +0100)]
Added suggestions from PR6068
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-
180797723
Alexander Shishkov [Mon, 8 Feb 2016 08:04:19 +0000 (11:04 +0300)]
Removed gittip link
This project is dead from 1st September last year
Alexander Alekhin [Sun, 7 Feb 2016 09:41:29 +0000 (09:41 +0000)]
Merge pull request #6075 from pranavg189:master
Pranav Ganorkar [Sat, 6 Feb 2016 21:39:21 +0000 (03:09 +0530)]
removed dirname variable
Alexander Alekhin [Sat, 6 Feb 2016 12:20:36 +0000 (15:20 +0300)]
ffmpeg: compatibility guard for interrupt callback feature
Alexander Alekhin [Sat, 6 Feb 2016 12:19:28 +0000 (15:19 +0300)]
cmake: skip checks for host paths on cross-compilation (5897)
Alexander Alekhin [Fri, 5 Feb 2016 14:03:22 +0000 (14:03 +0000)]
Merge pull request #6068 from StevenPuttemans:add_at_matrix_info
Alexander Alekhin [Fri, 5 Feb 2016 12:51:00 +0000 (12:51 +0000)]
Merge pull request #6067 from StevenPuttemans:adapt_cmake
StevenPuttemans [Fri, 5 Feb 2016 12:21:40 +0000 (13:21 +0100)]
add clarification on the acces paramter of the at operator
StevenPuttemans [Fri, 5 Feb 2016 10:01:21 +0000 (11:01 +0100)]
deactivate build options by default that are not supposed the be ON by default
Alexander Alekhin [Thu, 4 Feb 2016 19:33:20 +0000 (19:33 +0000)]
Merge pull request #6053 from peters:master
Peter Rekdal Sunde [Wed, 3 Feb 2016 00:00:43 +0000 (01:00 +0100)]
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.
Alexander Alekhin [Thu, 4 Feb 2016 15:14:02 +0000 (15:14 +0000)]
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
Alexander Alekhin [Thu, 4 Feb 2016 14:04:52 +0000 (14:04 +0000)]
Merge pull request #6062 from StevenPuttemans:fix_cascade_detect
StevenPuttemans [Thu, 4 Feb 2016 12:20:21 +0000 (13:20 +0100)]
revert PR 5362
Vadim Pisarevsky [Thu, 4 Feb 2016 09:54:27 +0000 (09:54 +0000)]
Merge pull request #6014 from alalek:fix_5991
Vadim Pisarevsky [Thu, 4 Feb 2016 09:31:35 +0000 (09:31 +0000)]
Merge pull request #6057 from alalek:fix_opencl_load_threadsafe
Suleyman TURKMEN [Wed, 3 Feb 2016 21:36:30 +0000 (23:36 +0200)]
update documentation of cv::repeat
Alexander Alekhin [Wed, 3 Feb 2016 11:06:20 +0000 (14:06 +0300)]
ocl: thread-safe OpenCL loading (6056)
Alexander Alekhin [Tue, 2 Feb 2016 16:03:54 +0000 (16:03 +0000)]
Merge pull request #6009 from patricksnape:flann_python_fix
Maksim Shabunin [Tue, 2 Feb 2016 09:45:41 +0000 (12:45 +0300)]
MacOSX / QTKit capture: trying to fix invalid timer call
Alexander Alekhin [Tue, 2 Feb 2016 07:25:33 +0000 (07:25 +0000)]
Merge pull request #6048 from philippefoubert:ximea_bugfix
Alexander Alekhin [Tue, 2 Feb 2016 07:08:49 +0000 (07:08 +0000)]
Merge pull request #6036 from atinfinity:pullreq/160130-enable-nvcuvid
Philippe FOUBERT [Mon, 1 Feb 2016 18:18:51 +0000 (19:18 +0100)]
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).
atinfinity [Mon, 1 Feb 2016 11:59:11 +0000 (20:59 +0900)]
added cmakedefine to cmake/templates/cvconfig.h.in
Dmitry-Me [Mon, 1 Feb 2016 08:10:13 +0000 (11:10 +0300)]
Reduce variables scope
atinfinity [Sat, 30 Jan 2016 16:28:15 +0000 (01:28 +0900)]
fixed to use NVCUVID in 'cudacodec' module.
Alexander Alekhin [Sat, 30 Jan 2016 08:22:59 +0000 (08:22 +0000)]
Merge pull request #6035 from ogreen:master
Oded Green [Sat, 30 Jan 2016 01:05:40 +0000 (20:05 -0500)]
CUDA median filtering using histograms
Alexander Alekhin [Fri, 29 Jan 2016 09:41:42 +0000 (09:41 +0000)]
Merge pull request #6012 from mzajko:xi_cmake_update
Alexander Alekhin [Tue, 26 Jan 2016 10:59:10 +0000 (13:59 +0300)]
core: preserve sizes values (fixes #5991)
_sizes can point to internal structure which is destroyed
by release() call
Alexander Alekhin [Tue, 26 Jan 2016 10:49:11 +0000 (13:49 +0300)]
test: regression 5991
Marian Zajko [Mon, 25 Jan 2016 12:13:13 +0000 (13:13 +0100)]
- removed whitespaces
Marian Zajko [Mon, 25 Jan 2016 10:05:55 +0000 (11:05 +0100)]
Fixed ximea cmake settings
Fixed ximea cmake settings for 32bit win build and linux.
Patrick Snape [Sat, 23 Jan 2016 15:58:16 +0000 (15:58 +0000)]
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.