Added guard to prevent from gpu module redefinition in OpenCV.mk
doc fix
-
making OCL tests conform to the comon style
disabling failing tests
Merge pull request #2517 from ilya-lavrenov:fix
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
Merge pull request #2503 from mlyashko:optflow_dualtvl1
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
Misprint fixed in table formatter
Merge pull request #2515 from apavlenko:perf_default_strategy
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
Merge pull request #2504 from asmorkalov:android_camera_locks_24
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
added 3-channels support to cv::Canny
Merge pull request #2520 from vlkolesnikov:misprint_fix
added 3 channels support to cv::bilateralFilter

Conflicts:
	modules/imgproc/test/ocl/test_filters.cpp
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
added 3-channels support to cv::filter2D, cv::Laplacian