generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
563200fbf6
opencv/modules/java/generator/src/java
History
Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +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 Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed. 2014-03-28 04:56:31 +04:00
android+LoaderCallbackInterface.java RESTART_REQUIRED status removed from OpenCV Manager API; 2012-10-09 10:34:40 +04:00
android+NativeCameraView.java Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4. 2014-03-21 14:16:03 +04:00
android+OpenCVLoader.java OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07:00
android+StaticHelper.java Multiple improvements in OpenCV examples build. 2014-02-06 15:32:57 +04:00
android+sync.py Normalized file endings. 2013-08-21 18:59:25 +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 adding method dims() to core.Mat 2013-07-17 15:04:34 +02:00
core+MatOfByte.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfDMatch.java Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
core+MatOfDouble.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfFloat4.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfFloat6.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfFloat.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfInt4.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfInt.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfKeyPoint.java Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
core+MatOfPoint2f.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfPoint3.java fixed cpackage -> package 2013-07-18 15:33:25 +02:00
core+MatOfPoint3f.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfPoint.java corrected some spelling errors 2013-07-18 13:24:55 +02:00
core+MatOfRect.java corrected some spelling errors 2013-07-18 13:24:55 +02: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 Dead code removed as this cannot be null in Java. 2014-02-13 18:17:47 +04:00
engine+OpenCVEngineInterface.aidl Normalized file endings. 2013-08-21 18:59:25 +04:00
utils+Converters.java Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00