compare with scalar (cn > 1)

Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage

Merge pull request #2403 from hbristow:issue-3451

Merge pull request #2379 from ngryman:optimize_jpeg

Merge pull request #2533 from kenaniah:master

corrected some style errors found by review.

added jpeg with optimized coding support.

Merge pull request #2535 from akarsakov:stereobm_fix

Fixed incorrect calculation of best_disp

Merge pull request #2286 from alalek:umat_unmap_issue

Fixed type gPython -> Python

Added link to main GitHub repo

Grammar

removed experimental slots

Improved standalone importing behaviour and creation of nested directories

Generalized todict implementation

More generic todict

disable failed tests

UMat: issue in OpenCLAllocator::unmap()

Merge pull request #2505 from alalek:umat_unmap_synchronization_test

Merge pull request #2529 from ilya-lavrenov:tapi_filter2D

Merge pull request #2528 from mlyashko:back_proj_fix

improved cv::filter2D

Merge pull request #2478 from clemenscorny:master

Merge pull request #2378 from ngryman:progressive_jpeg

Fixed stereoBM for Intel CPU.

added jpeg progressive support.

changed type of sanity check

Merge pull request #2523 from ilya-lavrenov:tapi_filters

UMat map-unmap synchronization test

FEATURES2D: add DenseFeatureDetector Python wrapper

Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix

added perf test for CalcBackProj

Merge pull request #2123 from white-pony:vkysenko/fix-mertens

Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix

Merge pull request #2524 from SpecLad:merge-2.4

ocl morphology fix

Merge pull request #2525 from ilya-lavrenov:tapi_sep

Merge pull request #2522 from ilya-lavrenov:tapi_canny

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp

Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser

eliminated restriction delta == 0 from cv::sepFilter2D

case-insensitivity

refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0

added 3-channels support to cv::medianBlur

added 3-channels support to cv::filter2D, cv::Laplacian

added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter

added 3 channels support to cv::bilateralFilter

Conflicts:
modules/imgproc/test/ocl/test_filters.cpp

added 3-channels support to cv::Canny

Merge pull request #2514 from asmorkalov:android_two_libs_cuda

Merge pull request #2504 from asmorkalov:android_camera_locks_24

Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert

Merge pull request #2515 from apavlenko:perf_default_strategy

Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter

Merge pull request #2503 from mlyashko:optflow_dualtvl1

Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree

Merge pull request #2517 from ilya-lavrenov:fix

doc fix

Added guard to prevent from gpu module redefinition in OpenCV.mk

Added test code for I/O of user-defined types.

Merge pull request #2454 from apavlenko:2.4_haar_extend

Merge pull request #2489 from vbystricky:iocl_pyrlk

changing default perf strategy from BASIC (old) to SIMPLE (new, faster)

Merge pull request #2508 from akarsakov:fix_erode_intel

Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device

Implicit linkage with CUDA runtime reverted.

Multiple fixes in camera.

Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.

added gpu type selection in OPENCV_OPENCL_DEVICE parser

Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm

Merge pull request #2495 from ilya-lavrenov:tapi_flip

Merge pull request #2500 from akarsakov:hog_intel_fix

added 3-channels support to optimized version

Merge pull request #2510 from asmorkalov:android_cuda_filter_fix

adding missing include (fixing 'no ocl implementation' error)

Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.

Merge pull request #2396 from m3d:patch-1

Merge pull request #2400 from RJ2:Bugfix_2

Merge pull request #2414 from yashdv:meanshift_tutorial_error

Merge pull request #2423 from RJ2:bugfix_5

Libraries filter update after abs path cut.

Merge pull request #2507 from apavlenko:haar_perf_test_cleanup

Workaround for Intel platform: replace min() with ternary operator

dropping legacy modes testing

switching to CV_HAAR_SCALE_IMAGE mode, enabling test

enabling OCL LBP branch for all devices

Merge pull request #2496 from ilya-lavrenov:tapi_imgproc

Merge pull request #2449 from asmorkalov:cuda_abs_path_fix

changed epsilon for test pass on Win32

Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters

Merge pull request #2494 from ilya-lavrenov:tapi_merge

Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice

enabled 3-channels support for cv::createSuperResolution_BTVL1

Fixed incorrect thread synchronizations

Merge pull request #2473 from euphrat:mog2_weight_bugfix

fixed bug in cv::ocl::predictOptimalVectorWidth

generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support

Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.

Enabled Intel-specific optimizations for HOG detector.

simplified cv::sepFilter2D OpenCL part

Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control