Merge remote-tracking branch 'origin/2.4'
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Jun 2013 12:57:31 +0000 (16:57 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 19 Jun 2013 11:25:37 +0000 (15:25 +0400)
commit13cd0a0502b88559b4a67d88768261cd21f18286
treee8d7946b2d1c70fc5deb7828b320644bf8f0dcac
parent71db862dc25e956e20623b714e25dfd56d130c18
parent843094a07ff0e19370502b70316d64b38023a5d6
Merge remote-tracking branch 'origin/2.4'

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
23 files changed:
CMakeLists.txt
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVModule.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/doc/basic_structures.rst
modules/core/src/matmul.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/highgui/CMakeLists.txt
modules/highgui/src/cap_dshow.cpp
modules/highgui/src/window.cpp
modules/imgproc/perf/perf_cvt_color.cpp
modules/java/generator/src/java/core+MatOfKeyPoint.java
modules/nonfree/src/sift.cpp
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/test/test_imgproc.cpp
modules/stitching/src/matchers.cpp
modules/stitching/src/motion_estimators.cpp
modules/video/perf/perf_optflowpyrlk.cpp
modules/videostab/src/global_motion.cpp
samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp