Merge pull request #2337 from pmoulon:master

Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius

Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8

Merge pull request #2351 from yashdv:BOW_assert_error

Fixed CV_ASSERT condition in the code for bag of words

Merge pull request #2336 from SpecLad:useOclChanged

Merge pull request #2326 from vpisarev:ocl_ch3

Fix a typo error

Fix a typo error

Deleted an assignment to a variable that doesn't exist.

Merge pull request #2315 from ilya-lavrenov:nlmeans_perf

Merge pull request #1735 from KonstantinMatskevich:umat_tests

Merge pull request #2062 from cook:bug3440

Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.

fixed OpenCL kernel flag in resize (thanks to Ilya L)

update

Merge pull request #2304 from mattvenn:master

-j8 in linux_installation tutorial

Merge pull request #2319 from m3d:patch-1

Merge pull request #2324 from vpisarev:fix_facedetect

added imgpoints back

Some tests for UMat

bugfix: blobdetector was putting incorrect diameter value in keypoints

tab => spaces

3-channel support in OpenCL kernels for setTo, resize, warpAffine and warpPerspective

fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)

Merge pull request #2322 from berak:b_cc_read

Merge pull request #2317 from blueskymonster:master

undo changes of cv2.cv.* functions/constants

added 3-channel support to arithmetic operations

removed return images and fixed cv2 names

Updated DisplayImage.cpp program to compile

CV_WINDOW_AUTOSIZE -> WINDOW_AUTOSIZE

added performance tests for NLMeans

Merge pull request #2311 from SvenWe:master

Merge pull request #2313 from m3d:patch-1

Merge pull request #1851 from dneelyep:patch-1

Merge pull request #2310 from SpecLad:merge-2.4

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

Conflicts:
CMakeLists.txt
cmake/OpenCVGenAndroidMK.cmake
cmake/templates/OpenCV.mk.in
doc/tutorials/viz/creating_widgets/creating_widgets.rst
doc/tutorials/viz/launching_viz/launching_viz.rst
doc/tutorials/viz/table_of_content_viz/images/image_effects.png
doc/tutorials/viz/transformations/transformations.rst
doc/tutorials/viz/widget_pose/widget_pose.rst
modules/core/include/opencv2/core/affine.hpp
modules/core/include/opencv2/core/core.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_color.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_gpumat.cpp
modules/gpu/test/test_hough.cpp
modules/nonfree/CMakeLists.txt
modules/nonfree/include/opencv2/nonfree/gpu.hpp
modules/nonfree/perf/perf_gpu.cpp
modules/nonfree/src/cuda/surf.cu
modules/nonfree/src/precomp.hpp
modules/nonfree/src/surf_gpu.cpp
modules/nonfree/test/test_gpu.cpp
modules/ocl/perf/perf_haar.cpp
modules/stitching/CMakeLists.txt
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
modules/stitching/include/opencv2/stitching/warpers.hpp
modules/stitching/src/blenders.cpp
modules/stitching/src/matchers.cpp
modules/stitching/src/precomp.hpp
modules/stitching/src/seam_finders.cpp
modules/stitching/src/stitcher.cpp
modules/stitching/src/warpers.cpp
modules/viz/doc/widget.rst
modules/viz/include/opencv2/viz/types.hpp
modules/viz/include/opencv2/viz/viz3d.hpp
modules/viz/include/opencv2/viz/widget_accessor.hpp
modules/viz/src/precomp.hpp
modules/viz/src/shapes.cpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkCloudMatSource.h
modules/viz/test/test_precomp.hpp
modules/viz/test/tests_simple.cpp
samples/android/tutorial-4-cuda/CMakeLists.txt
samples/android/tutorial-4-cuda/jni/Android.mk
samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
samples/cpp/stitching_detailed.cpp
samples/cpp/tutorial_code/viz/creating_widgets.cpp
samples/cpp/tutorial_code/viz/launching_viz.cpp
samples/cpp/tutorial_code/viz/transformations.cpp
samples/cpp/tutorial_code/viz/widget_pose.cpp

fixed spelling and removed return images

grabcut.py sample: Allow drawing rect from bottom/right

The grabcut sample script isn't able to create rectangles correctly that are
drawn from e.g. bottom-right to top-left.
This small commit uses four min() calls to determine the correct
top-left point of the rectangle.
It also removes some unnecessary white spaces before colons.

removed whitespace at end of line 96

proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode

fixed whitespace

fixed examples for opencv 2.4.8

Merge pull request #2303 from jet47:gpu-canny-fix

Merge pull request #2295 from alalek:opencl_align_rw_buffers

Merge pull request #2294 from jet47:fix-gpu-issues

Merge pull request #2296 from apavlenko:fix_coverity_scan

fixed several bugs in CUDA Canny implementation:

* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd

Merge pull request #2301 from jet47:fix-nonfree-build

Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix

Revert "disable gpu Canny and HoughCircles perf tests:"

This reverts commit dbce90692acd84fbf46bde4da4b1726049f42857.

ocl: update gftt

ocl: workaround for failures with misaligned host buffers

Implicit testdata directory permissions setup added.

Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a

fix nonfree module compilation without CUDA

dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.

Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter

Merge pull request #2287 from ilya-lavrenov:mat_step

Merge pull request #2289 from ilya-lavrenov:umat_expr

fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (scan.coverity.com/projects/169?tab=Overview)

added cv::sqrBoxFilter to T-API

Revert "disable CUDA generalized Hough Transform"

This reverts commit 33d42b740c6fe938b63a0b25c9ad51741aba48c3.

fix epsilons for several gpu tests

Revert "disable gpu CvtColor.*2HSV tests:"

This reverts commit 952027a8536215a5e4308c79a59308c6b3426354.

Revert "disable gpu Subtract_Array test:"

This reverts commit e91bf95d5832e87aa70240c50f0bf7fcc587e8c8.

Merge pull request #2269 from Nerei:qt5_vtk_guards

Merge pull request #2276 from asmorkalov:android_install_cuda

condition for Mat step

Multiple improvements in OpenCV examples build.

EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.

Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix

Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray

Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4

Absolute path to tests in opencv_run_app_tests.sh fixed.

Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix

added perf test

implemented umat expressions

Merge pull request #2002 from abak:stereo_calibrate

project.properties file generation fixed for per-component installation.

Merge tag '3.0-ocl-tp2' (-s ours)

OpenCV 3.0 OpenCL Technical Preview 2

Set status to -tp2.

fixes2

Merge pull request #2284 from KonstantinMatskevich:ocl_test_cascade

Merge pull request #2277 from asmorkalov:android_test_path_fix

update test CascadeClassifier

update test for cascade

fixed docs2

Merge pull request #2281 from vpisarev:ocl_surf

removed CV_IN/OUT

fixed docs

fixes

Merge pull request #2250 from ilya-lavrenov:tapi_renaming

cleaned up super_resolution sample from old OCL

fixed warnings/errors from GCC

Merge pull request #2280 from ilya-lavrenov:attempt_pvc

fixed warnings from OCL and DOC builders

Merge pull request #2279 from alalek:fix_memory_leak_getumat

undone change in ocl.hpp (explicit Image2D constructor)

SURF kind of works (let's see if the tests pass)