Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.

Fix a typo error
Conflicts:
	modules/features2d/include/opencv2/features2d.hpp

- Fix both stitching_detailed.cpp sample and cv::Stitcher.

remove the unnecessary header file

check input paramter by checking the image size

Conflicts:
	samples/CMakeLists.txt

Conflicts:
	samples/gpu/video_writer.cpp

Update android+AsyncServiceHelper.java

Update android+AsyncServiceHelper.java

changed tabs in last commit to spaces

Update android+AsyncServiceHelper.java

small formatting fixes

added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html

Conflicts:
	modules/imgcodecs/src/grfmt_tiff.cpp

In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250

removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface

Conflicts:
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	samples/cpp/starter_video.cpp

starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error

starter_video.cpp hid local functions

sanity fails on Maxwell and CUDA 7.0 due to unknow reason

in case if image has odd dimension