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

Tree: 43e7e6e475

opencv/modules/java

History

Roman Donchenko 5ac3b8d5d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Pull requests: #904 An error occurred from ograycode:2.4 #905 An error occurred from bitwangyaoyao:2.4_TVL1 #902 An error occurred from apavlenko:fix_run_py #882 An error occurred from pengx17:2.4_rewrite_query_info Conflicts: modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/hog.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/tvl1flow.cpp		12 years ago
..
android_lib	Merge pull request #800 An error occurred from asmorkalov:android_cam_idx_semantic	12 years ago
android_test	Move C API of opencv_calib3d to separate file	12 years ago
generator	Merge remote-tracking branch 'origin/2.4' into merge-2.4	12 years ago
test	Merge branch '2.4'	12 years ago
CMakeLists.txt	Merge branch '2.4'	12 years ago
build.xml.in	Fix for encoding errors when building Java source	12 years ago
check-tests.py	Fixed the shebang lines on the Python scripts.	12 years ago