Open Source Computer Vision Library https://opencv.org/

Tree: a29ce401d5

opencv/modules/features2d

History

Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4' ... Original pull requests: #996 An error occurred from jet47:gpu-nvcuvid-libraries #995 An error occurred from jet47:fix-bug-2985 #999 An error occurred from snosov1:unreliable-results-fix #1005 An error occurred from alekcac:doc_fix #1004 An error occurred from jet47:fix-bug-3068 #987 An error occurred from jet47:bug-3085-fix #969 An error occurred from pengx17:2.4_binary_cache #929 An error occurred from dominikrose:mingw-libdc1394-2-windows #1000 An error occurred from ivan-korolev:fix_sift_bug_2892 #1001 An error occurred from ivan-korolev:fix_stitching_bug_2405 #998 An error occurred from asmorkalov:android_cmake_mips_fix #993 An error occurred from ivan-korolev:fix_videostab_bug_3023 #988 An error occurred from snosov1:3071-fix #986 An error occurred from pengx17:2.4_initiated_context #982 An error occurred from pengx17:2.4_fix_two_bugs #981 An error occurred from SeninAndrew:ximea_camera_support_fix #991 An error occurred from asmorkalov:android_javadoc_fix #972 An error occurred from jet47:mog2-params-bug-2168 #980 An error occurred from SpecLad:include-config #973 An error occurred from pengx17:2.4_oclclahe #903 An error occurred from aks2:2.4 #968 An error occurred from asmorkalov:android_na_cproj_fix #971 An error occurred from SpecLad:matchers-ctor #970 An error occurred from asmorkalov:dshow_valid_check_fix #965 An error occurred 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		12 years ago
..
doc	Merge remote-tracking branch 'origin/2.4'	12 years ago
include/opencv2	Merge pull request #696 An error occurred from znah:detect_method	12 years ago
perf	Merge branch '2.4'	12 years ago
src	Merge pull request #696 An error occurred from znah:detect_method	12 years ago
test	Move border type constants and Moments class to core module	12 years ago
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	13 years ago