• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' · 13cd0a05
    Roman Donchenko authored
    Original pull requests:
    	#996 from jet47:gpu-nvcuvid-libraries
    	#995 from jet47:fix-bug-2985
    	#999 from snosov1:unreliable-results-fix
    	#1005 from alekcac:doc_fix
    	#1004 from jet47:fix-bug-3068
    	#987 from jet47:bug-3085-fix
    	#969 from pengx17:2.4_binary_cache
    	#929 from dominikrose:mingw-libdc1394-2-windows
    	#1000 from ivan-korolev:fix_sift_bug_2892
    	#1001 from ivan-korolev:fix_stitching_bug_2405
    	#998 from asmorkalov:android_cmake_mips_fix
    	#993 from ivan-korolev:fix_videostab_bug_3023
    	#988 from snosov1:3071-fix
    	#986 from pengx17:2.4_initiated_context
    	#982 from pengx17:2.4_fix_two_bugs
    	#981 from SeninAndrew:ximea_camera_support_fix
    	#991 from asmorkalov:android_javadoc_fix
    	#972 from jet47:mog2-params-bug-2168
    	#980 from SpecLad:include-config
    	#973 from pengx17:2.4_oclclahe
    	#903 from aks2:2.4
    	#968 from asmorkalov:android_na_cproj_fix
    	#971 from SpecLad:matchers-ctor
    	#970 from asmorkalov:dshow_valid_check_fix
    	#965 from apavlenko:fix_java_empty_mats
    
    Conflicts:
    	cmake/OpenCVModule.cmake
    	modules/core/src/matmul.cpp
    	modules/gpu/CMakeLists.txt
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_imgproc.cpp
    	modules/ocl/src/imgproc.cpp
    	modules/ocl/src/initialization.cpp
    	modules/stitching/src/matchers.cpp
    	modules/video/src/video_init.cpp
    	modules/videostab/src/global_motion.cpp
    13cd0a05
Name
Last commit
Last update
..
checks Merge branch '2.4'
templates Merge branch '2.4'
CMakeParseArguments.cmake minor fix in FindTBB
OpenCVCRTLinkage.cmake Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration
OpenCVCompilerOptions.cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4
OpenCVConfig.cmake Advance version number to 2.4.3-rc
OpenCVDetectAndroidSDK.cmake Merge remote-tracking branch 'origin/2.4'
OpenCVDetectApacheAnt.cmake Fix ant/Java detection in cmake scripts
OpenCVDetectCStripes.cmake fixed C= detection script
OpenCVDetectCUDA.cmake fixed compiler warning
OpenCVDetectCXXCompiler.cmake Fix build warnings from gcc 4.8
OpenCVDetectOpenCL.cmake fix for bug #2985:
OpenCVDetectPython.cmake Updated cmake files to use print().
OpenCVDetectTBB.cmake TBB download and build option enabled for non Android platfroms.
OpenCVExtraTargets.cmake Drop outdated targets and fix solution folders
OpenCVFindIPP.cmake fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!)
OpenCVFindLATEX.cmake Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
OpenCVFindLibsGUI.cmake Fix a missing header path when building with Qt 4.
OpenCVFindLibsGrfmt.cmake Merge branch '2.4'
OpenCVFindLibsPerf.cmake Merge branch '2.4'
OpenCVFindLibsVideo.cmake Merge remote-tracking branch 'origin/2.4'
OpenCVFindOpenEXR.cmake Normalize line endings and whitespace
OpenCVFindOpenNI.cmake Normalize line endings and whitespace
OpenCVFindPkgConfig.cmake Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
OpenCVFindWebP.cmake This code is based on https://github.com/prasannatsm/opencv code.
OpenCVFindXimea.cmake Fixed Ximea cameras support
OpenCVGenAndroidMK.cmake Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
OpenCVGenConfig.cmake android -> plarforms/android
OpenCVGenHeaders.cmake Fixed linux and android install
OpenCVGenPkgconfig.cmake Fixed linux and android install
OpenCVLegacyOptions.cmake Code review notes fixed.
OpenCVModule.cmake Merge remote-tracking branch 'origin/2.4'
OpenCVPCHSupport.cmake Compile opencv_test_core with cv::String instead of std::string
OpenCVUtils.cmake Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows
OpenCVVersion.cmake Consistently use 4-digit library version
cl2cpp.cmake discard comments in kernels.cpp