Conflicts:
	modules/highgui/src/grfmt_tiff.cpp

floodfill return value removed

Install symlinks to shared libraries as a part of development package,
not runtime package.

It is default behavior for debian packages.

Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp

Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".

Conflicts:
	modules/highgui/src/grfmt_tiff.cpp
	modules/highgui/test/test_grfmt.cpp

fix whitespace

fix compile error

Conflicts:
	modules/features2d/src/draw.cpp

Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp

Conflicts:
	modules/gpu/doc/per_element_operations.rst

tiff test fixed

(cherry picked from commit e650d87e)
(cherry picked from commit ca9c52ac)

Conflicts:
	cmake/OpenCVPackaging.cmake

Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.

Conflicts:
	modules/highgui/src/cap_dshow.cpp

At least this is how it's defined in core/types_c.h

Conflicts:
	modules/core/doc/intro.rst

The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.

Conflicts:
	modules/calib3d/src/stereobm.cpp

Add CV_Assert (ndisp % 8 == 0) to NEON version

Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389)

Conflicts:
	modules/highgui/src/cap_ios_abstract_camera.mm

Android camera qcom HAL doesn't like it when no consumer usage bits are set. Set a usage bit for preview BufferQueue.

fix MatOpInitializer

removed HAL calls from public OpenCV headers; put IPP calls back to hall:sqrt() and such (but they are disabled for now)

Signed-off-by: NMaxim Kostin <v-maxkos@microsoft.com>

another attempt to make the MSER test pass. removed possible randomization in parameters from run to run