third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b939b4ae3b
opencv/modules/java/generator/src/java
History
Roman Donchenko 72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
2014-02-11 12:05:01 +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 MediaRecorder hint enabled for all Android devices with API level 14 and above. 2013-09-10 18:05:45 +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 Multiple improvements in OpenCV examples build. 2014-02-06 15:32:57 +04: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 Normalize line endings and whitespace 2012-10-17 15:32:23 +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