Roman Donchenko 72aabb8a84 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

2014-02-11 12:05:01 +04:00

..

checks

cmake: detect Direct 3D 11

2013-12-13 15:57:31 +04:00

FindCUDA

added own version of FindCUDA.cmake

2013-10-28 10:09:16 +04:00

templates

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

2014-02-11 12:05:01 +04:00

cl2cpp.cmake

renamed **2 -> **

2014-02-04 19:55:11 +04:00

FindCUDA.cmake

fixed CUDA_TOOLKIT_TARGET_DIR for android:

2013-11-28 13:35:23 +04:00

OpenCVCompilerOptions.cmake

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

2013-12-23 18:50:17 +04:00

OpenCVConfig.cmake

Added Visual Studio 2013 detection.

2013-11-18 19:39:39 +04:00

OpenCVCRTLinkage.cmake

Update CMakeLists.txt

2013-12-26 19:45:21 +08:00

OpenCVDetectAndroidSDK.cmake

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

2014-02-11 12:05:01 +04:00

OpenCVDetectApacheAnt.cmake

Fix ant/Java detection in cmake scripts

2013-03-29 18:29:40 +04:00

OpenCVDetectCStripes.cmake

fixed C= detection script

2012-10-10 16:15:27 +04:00

OpenCVDetectCUDA.cmake

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

2013-12-03 17:35:21 +04:00

OpenCVDetectCXXCompiler.cmake

Added Visual Studio 2013 detection.

2013-11-18 19:39:39 +04:00

OpenCVDetectDirectX.cmake

cmake: detect Direct 3D 11

2013-12-13 15:57:31 +04:00

OpenCVDetectOpenCL.cmake

ocl: force to use Khronos OpenCL headers

2013-10-18 15:47:11 +04:00

OpenCVDetectPython.cmake

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

2014-01-27 15:28:14 +04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

2013-02-06 14:43:57 +04:00

OpenCVDetectVTK.cmake

added guard against linking qt5 and VTK together

2014-02-02 16:23:33 +04:00

OpenCVExtraTargets.cmake

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +04:00

OpenCVFindIntelPerCSDK.cmake

Fix notes about cmake files. Fix build warning.

2013-12-17 16:13:55 +04:00

OpenCVFindIPP.cmake

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenCVFindLATEX.cmake

Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.

2012-01-03 13:48:12 +00:00

OpenCVFindLibsGrfmt.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVFindLibsGUI.cmake

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

2013-08-27 19:15:47 +04:00

OpenCVFindLibsPerf.cmake

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

2013-10-28 13:38:25 +04:00

OpenCVFindLibsVideo.cmake

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

2013-12-23 18:50:17 +04:00

OpenCVFindMatlab.cmake

Added TODO for the future of Matlab version sorting

2013-09-16 00:48:07 +10:00

OpenCVFindOpenEXR.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindOpenNI.cmake

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

OpenCVFindWebP.cmake

This code is based on https://github.com/prasannatsm/opencv code.

2013-03-11 11:51:38 +04:00

OpenCVFindXimea.cmake

Fix the build of OpenCV with XIMEA on Windows 64 bits:

2013-11-10 17:46:59 +01:00

OpenCVGenAndroidMK.cmake

Multiple improvements in OpenCV examples build.

2014-02-06 15:32:57 +04:00

OpenCVGenConfig.cmake

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +04:00

OpenCVGenHeaders.cmake

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +04:00

OpenCVGenInfoPlist.cmake

Fix building the iOS framework after I dropped the VERSION macro.

2013-08-06 18:56:36 +04:00

OpenCVGenPkgconfig.cmake

Removed all use of the obsolete IMMEDIATE parameter to configure_file.

2014-01-29 19:34:02 +04:00

OpenCVMinDepVersions.cmake

Move the minimal CUDA version into the minimal version list.

2013-10-22 14:32:13 +04:00

OpenCVModule.cmake

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

2014-02-03 13:23:59 +04:00

OpenCVPackaging.cmake

Multiple fixes for tests deb package build.

2014-01-28 16:32:26 +04:00

OpenCVPCHSupport.cmake

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

OpenCVUtils.cmake

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

2014-02-11 12:05:01 +04:00

OpenCVVersion.cmake

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00