fixed cmd parser when arg is like -+
Fix ocl::calcHarris not support CV_32FC1 bug.
A minor fix.
Fix merge conflicts
Fix the whitespace warning.
Slight modification to example code for FLANN matcher with comment on #3344
Replaced code in .rst file with literalinclude as suggested
Wrong example at the visual studio tutorial. Fixed link, fixed sample
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
ocl: multi-threading: fix bug in intialization
ocl: multi-threading: opencl buffer memory guard
Applied fix mentioned in bugreport 3370. Seems to solve the issue.
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes
Merge pull request #1842 from StevenPuttemans:bugfix_3315
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
fixed comparison to stop integer wrap around
Merge pull request #1856 from alalek:ocl_fix_mt
modified HoughCircleDemo to introduce variable params via trackbars

Conflicts:
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
improved error handling
fix typos
fix indent