Roman Donchenko dcaf923517 Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp

2013-08-06 13:56:49 +04:00

..

checks

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

templates

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

cl2cpp.cmake

discard comments in kernels.cpp

2013-03-26 12:01:01 +08:00

CMakeParseArguments.cmake

minor fix in FindTBB

2012-08-23 13:37:27 +04:00

OpenCVCompilerOptions.cmake

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

2013-06-10 18:18:01 +04:00

OpenCVConfig.cmake

Advance version number to 2.4.3-rc

2012-10-23 17:59:59 +04:00

OpenCVCRTLinkage.cmake

Warning and review notes fixes.

2013-08-02 04:10:56 -07:00

OpenCVDetectAndroidSDK.cmake

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +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-07-22 18:38:57 +04:00

OpenCVDetectCXXCompiler.cmake

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

OpenCVDetectOpenCL.cmake

Fix cmake path finding for amd libs.

2013-06-19 11:31:42 +08:00

OpenCVDetectPython.cmake

Updated cmake files to use print().

2013-06-13 20:10:01 -04:00

OpenCVDetectTBB.cmake

TBB download and build option enabled for non Android platfroms.

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

OpenCVExtraTargets.cmake

Drop outdated targets and fix solution folders

2013-03-25 21:57:53 +04:00

OpenCVFindIPP.cmake

fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!)

2012-10-08 22:00: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'

2013-08-06 13:56:49 +04:00

OpenCVFindLibsGUI.cmake

Refactored detecting several Apple-related technologies.

2013-07-10 19:45:56 +04:00

OpenCVFindLibsPerf.cmake

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

OpenCVFindLibsVideo.cmake

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04: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

OpenCVFindPkgConfig.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

OpenCVFindWebP.cmake

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

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

OpenCVFindXimea.cmake

Fixed Ximea cameras support

2013-06-11 21:17:31 +04:00

OpenCVGenAndroidMK.cmake

Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

2013-02-22 11:57:42 +04:00

OpenCVGenConfig.cmake

Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.

2013-08-04 20:52:49 +02:00

OpenCVGenHeaders.cmake

Removed unused PACKAGE_* macros.

2013-07-11 14:30:46 +04:00

OpenCVGenPkgconfig.cmake

Removed useless VERSION macro (and CMake variable)

2013-07-11 14:30:46 +04:00

OpenCVModule.cmake

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

OpenCVPCHSupport.cmake

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

OpenCVUtils.cmake

Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

2013-06-14 15:46:25 +04:00

OpenCVVersion.cmake

Consistently use 4-digit library version

2013-01-18 14:57:55 +04:00