opencv/modules/java/generator/src/java
Roman Donchenko 13cd0a0502 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
2013-06-19 15:25:37 +04:00
..
android+AsyncServiceHelper.java Build info output for all android apps added. 2013-02-12 11:19:05 +04:00
android+BaseLoaderCallback.java OpenCV Samples testing problems fixed: 2012-10-31 17:24:50 +04:00
android+CameraBridgeViewBase.java Javadoc waring fix. 2013-06-13 12:40:14 +04:00
android+FpsMeter.java Code review comments applied. 2012-11-27 14:55:49 +04:00
android+InstallCallbackInterface.java Wating for OpenCV Manager installation added. 2012-10-08 14:37:59 +04:00
android+JavaCameraView.java Merge pull request #846 from smart-mobile-software:tuto_crash 2013-05-07 15:15:16 +04:00
android+LoaderCallbackInterface.java RESTART_REQUIRED status removed from OpenCV Manager API; 2012-10-09 10:34:40 +04:00
android+NativeCameraView.java NullPointerException in case of error on opening native camera fixed. 2013-04-29 11:00:52 +04:00
android+OpenCVLoader.java OpenCV verison incremented 2013-04-04 15:50:36 +04:00
android+StaticHelper.java Build info output for all android apps added. 2013-02-12 11:19:05 +04:00
android+sync.py Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
android+Utils.java RESTART_REQUIRED status removed from OpenCV Manager API; 2012-10-09 10:34:40 +04:00
core+CvException.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+CvType.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+DMatch.java Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
core+KeyPoint.java Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
core+Mat.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+MatOfByte.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfDMatch.java Merge branch '2.4' 2013-04-05 21:11:59 +04:00
core+MatOfDouble.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfFloat4.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfFloat6.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfFloat.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfInt4.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfInt.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfKeyPoint.java Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
core+MatOfPoint2f.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfPoint3.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfPoint3f.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfPoint.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+MatOfRect.java fixing empty Mat case 2013-06-08 12:41:57 +04:00
core+Point3.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+Point.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+Range.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+Rect.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+RotatedRect.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+Scalar.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+Size.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
core+TermCriteria.java Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
engine+OpenCVEngineInterface.aidl Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
highgui+VideoCapture.java Improved javadoc comments. 2012-08-28 15:49:50 +04:00
utils+Converters.java Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00