review.tizen.org Git - profile/ivi/opencv.git/commit

projects / profile / ivi / opencv.git / commit

author	Vadim Pisarevsky <no@email>
	Mon, 30 Apr 2012 14:33:52 +0000 (14:33 +0000)
committer	Vadim Pisarevsky <no@email>
	Mon, 30 Apr 2012 14:33:52 +0000 (14:33 +0000)
commit	d5a0088bbe3605e4fdd41cc41987d4a2b5d4715c
tree	c4c8d654fd64b72fd6898ee510fc97f0f3703506	tree \| snapshot
parent	3f1c6d7357ef7f00e271e53441469c226fd9e46c	commit \| diff

merged 2.4 into trunk

194 files changed:

CMakeLists.txt		diff \| blob \| history
android/android.toolchain.cmake		diff \| blob \| history
android/scripts/build.cmd		diff \| blob \| history
cmake/OpenCVCompilerOptions.cmake		diff \| blob \| history
cmake/OpenCVDetectAndroidSDK.cmake		diff \| blob \| history
cmake/OpenCVDetectApacheAnt.cmake		diff \| blob \| history
cmake/OpenCVDetectCXXCompiler.cmake		diff \| blob \| history
cmake/OpenCVDetectPython.cmake		diff \| blob \| history
cmake/OpenCVIOLibs.cmake		diff \| blob \| history
cmake/OpenCVModule.cmake		diff \| blob \| history
cmake/OpenCVUtils.cmake		diff \| blob \| history
cmake/templates/OpenCVConfig.cmake.in		diff \| blob \| history
doc/_themes/blue/static/default.css_t		diff \| blob \| history
doc/opencv2refman.pdf		diff \| blob \| history
doc/opencv_tutorials.pdf		diff \| blob \| history
doc/opencv_user.pdf		diff \| blob \| history
doc/tutorials/introduction/linux_install/linux_install.rst		diff \| blob \| history
doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst		diff \| blob \| history
doc/user_guide/ug_mat.rst		diff \| blob \| history
modules/calib3d/src/calibinit.cpp		diff \| blob \| history
modules/calib3d/src/calibration.cpp		diff \| blob \| history
modules/contrib/src/contrib_init.cpp	[new file with mode: 0644]	blob
modules/contrib/src/hybridtracker.cpp		diff \| blob \| history
modules/core/doc/basic_structures.rst		diff \| blob \| history
modules/core/doc/old_basic_structures.rst		diff \| blob \| history
modules/core/doc/pics/rotatedrect.png	[new file with mode: 0644]	blob
modules/core/include/opencv2/core/core.hpp		diff \| blob \| history
modules/core/include/opencv2/core/devmem2d.hpp		diff \| blob \| history
modules/core/include/opencv2/core/mat.hpp		diff \| blob \| history
modules/core/include/opencv2/core/operations.hpp		diff \| blob \| history
modules/core/include/opencv2/core/types_c.h		diff \| blob \| history
modules/core/src/algorithm.cpp		diff \| blob \| history
modules/core/src/mathfuncs.cpp		diff \| blob \| history
modules/core/src/precomp.hpp		diff \| blob \| history
modules/core/src/rand.cpp		diff \| blob \| history
modules/core/src/stat.cpp		diff \| blob \| history
modules/core/test/test_arithm.cpp		diff \| blob \| history
modules/core/test/test_eigen.cpp		diff \| blob \| history
modules/core/test/test_math.cpp		diff \| blob \| history
modules/core/test/test_operations.cpp		diff \| blob \| history
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst		diff \| blob \| history
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst		diff \| blob \| history
modules/features2d/doc/common_interfaces_of_feature_detectors.rst		diff \| blob \| history
modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst		diff \| blob \| history
modules/features2d/doc/feature_detection_and_description.rst		diff \| blob \| history
modules/features2d/include/opencv2/features2d/features2d.hpp		diff \| blob \| history
modules/features2d/src/descriptors.cpp		diff \| blob \| history
modules/features2d/src/detectors.cpp		diff \| blob \| history
modules/features2d/src/features2d_init.cpp	[new file with mode: 0644]	blob
modules/features2d/test/test_bruteforcematcher.cpp	[deleted file]	blob \| history
modules/features2d/test/test_features2d.cpp		diff \| blob \| history
modules/flann/src/miniflann.cpp		diff \| blob \| history
modules/gpu/include/opencv2/gpu/gpu.hpp		diff \| blob \| history
modules/gpu/src/cuda/optical_flow_farneback.cu		diff \| blob \| history
modules/gpu/src/cuda/pyrlk.cu		diff \| blob \| history
modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu		diff \| blob \| history
modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu		diff \| blob \| history
modules/gpu/src/optical_flow_farneback.cpp		diff \| blob \| history
modules/gpu/src/orb.cpp		diff \| blob \| history
modules/gpu/test/test_video.cpp		diff \| blob \| history
modules/highgui/CMakeLists.txt		diff \| blob \| history
modules/highgui/include/opencv2/highgui/highgui_c.h		diff \| blob \| history
modules/highgui/src/cap.cpp		diff \| blob \| history
modules/highgui/src/cap_avfoundation.mm		diff \| blob \| history
modules/highgui/src/cap_ffmpeg.cpp		diff \| blob \| history
modules/highgui/src/cap_ffmpeg_impl.hpp		diff \| blob \| history
modules/highgui/src/cap_openni.cpp		diff \| blob \| history
modules/highgui/src/cap_pvapi.cpp		diff \| blob \| history
modules/highgui/src/grfmt_png.cpp		diff \| blob \| history
modules/highgui/src/window_QT.cpp		diff \| blob \| history
modules/highgui/test/test_drawing.cpp		diff \| blob \| history
modules/highgui/test/test_ffmpeg.cpp		diff \| blob \| history
modules/highgui/test/test_framecount.cpp		diff \| blob \| history
modules/highgui/test/test_grfmt.cpp		diff \| blob \| history
modules/highgui/test/test_positioning.cpp		diff \| blob \| history
modules/highgui/test/test_precomp.hpp		diff \| blob \| history
modules/highgui/test/test_video_io.cpp		diff \| blob \| history
modules/highgui/test/test_video_pos.cpp		diff \| blob \| history
modules/imgproc/doc/geometric_transformations.rst		diff \| blob \| history
modules/imgproc/doc/imgproc.rst		diff \| blob \| history
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst		diff \| blob \| history
modules/imgproc/include/opencv2/imgproc/imgproc.hpp		diff \| blob \| history
modules/imgproc/perf/perf_blur.cpp		diff \| blob \| history
modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp		diff \| blob \| history
modules/imgproc/perf/perf_integral.cpp		diff \| blob \| history
modules/imgproc/src/contours.cpp		diff \| blob \| history
modules/imgproc/src/smooth.cpp		diff \| blob \| history
modules/imgproc/src/utils.cpp		diff \| blob \| history
modules/java/CMakeLists.txt		diff \| blob \| history
modules/java/android/.project		diff \| blob \| history
modules/java/android/AndroidManifest.xml		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/android/UtilsTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/calib3d/Calib3dTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/core/CoreTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/core/MatTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingLUTDescriptorMatcherTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/features2d/ORBDescriptorExtractorTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java		diff \| blob \| history
modules/java/android_test/src/org/opencv/test/imgproc/Subdiv2DTest.java		diff \| blob \| history
modules/java/config/core.filelist		diff \| blob \| history
modules/java/config/nonfree.filelist	[new file with mode: 0644]	blob
modules/java/gen_java.py		diff \| blob \| history
modules/java/gen_javadoc.py		diff \| blob \| history
modules/java/rst_parser.py		diff \| blob \| history
modules/java/src/cpp/Mat.cpp		diff \| blob \| history
modules/java/src/cpp/converters.cpp		diff \| blob \| history
modules/java/src/cpp/converters.h		diff \| blob \| history
modules/java/src/cpp/core_manual.hpp	[new file with mode: 0644]	blob
modules/java/src/cpp/jni_part.cpp		diff \| blob \| history
modules/java/src/java/core+Mat.java		diff \| blob \| history
modules/java/src/java/core+MatOfFloat4.java	[new file with mode: 0644]	blob
modules/java/src/java/core+MatOfFloat6.java	[new file with mode: 0644]	blob
modules/java/src/java/core+MatOfInt4.java	[new file with mode: 0644]	blob
modules/java/src/java/utils+Converters.java		diff \| blob \| history
modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst	[new file with mode: 0644]	blob
modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst	[new file with mode: 0644]	blob
modules/legacy/doc/expectation_maximization.rst	[new file with mode: 0644]	blob
modules/legacy/doc/feature_detection_and_description.rst	[new file with mode: 0644]	blob
modules/legacy/doc/legacy.rst		diff \| blob \| history
modules/legacy/doc/pics/quadedge.png	[new file with mode: 0644]	blob
modules/legacy/doc/pics/subdiv.png	[new file with mode: 0644]	blob
modules/legacy/doc/planar_subdivisions.rst	[new file with mode: 0644]	blob
modules/legacy/include/opencv2/legacy/legacy.hpp		diff \| blob \| history
modules/legacy/src/bgfg_gaussmix.cpp		diff \| blob \| history
modules/legacy/src/em.cpp		diff \| blob \| history
modules/legacy/src/features2d.cpp		diff \| blob \| history
modules/legacy/test/test_bruteforcematcher.cpp	[new file with mode: 0644]	blob
modules/legacy/test/test_nearestneighbors.cpp		diff \| blob \| history
modules/legacy/test/test_optflow.cpp		diff \| blob \| history
modules/legacy/test/test_pyrsegmentation.cpp		diff \| blob \| history
modules/legacy/test/test_stereomatching.cpp		diff \| blob \| history
modules/legacy/test/test_subdivisions.cpp		diff \| blob \| history
modules/ml/doc/ertrees.rst		diff \| blob \| history
modules/ml/doc/expectation_maximization.rst		diff \| blob \| history
modules/ml/doc/mldata.rst		diff \| blob \| history
modules/ml/include/opencv2/ml/ml.hpp		diff \| blob \| history
modules/ml/src/data.cpp		diff \| blob \| history
modules/ml/src/em.cpp		diff \| blob \| history
modules/ml/src/ml_init.cpp	[new file with mode: 0644]	blob
modules/ml/test/test_emknearestkmeans.cpp		diff \| blob \| history
modules/nonfree/doc/feature_detection.rst		diff \| blob \| history
modules/nonfree/src/nonfree_init.cpp	[new file with mode: 0644]	blob
modules/nonfree/src/precomp.cpp		diff \| blob \| history
modules/nonfree/src/sift.cpp		diff \| blob \| history
modules/nonfree/src/surf.cpp		diff \| blob \| history
modules/nonfree/test/test_features2d.cpp		diff \| blob \| history
modules/objdetect/include/opencv2/objdetect/objdetect.hpp		diff \| blob \| history
modules/objdetect/src/datamatrix.cpp		diff \| blob \| history
modules/objdetect/src/objdetect_init.cpp	[new file with mode: 0644]	blob
modules/objdetect/test/test_latentsvmdetector.cpp		diff \| blob \| history
modules/python/CMakeLists.txt		diff \| blob \| history
modules/python/src2/cv2.cpp		diff \| blob \| history
modules/python/src2/cv2.cv.hpp		diff \| blob \| history
modules/python/test/goodfeatures.py		diff \| blob \| history
modules/python/test/test.py		diff \| blob \| history
modules/stitching/perf/perf_stich.cpp		diff \| blob \| history
modules/stitching/src/stitcher.cpp		diff \| blob \| history
modules/stitching/test/test_matchers.cpp		diff \| blob \| history
modules/ts/misc/run.py		diff \| blob \| history
modules/ts/src/ts.cpp		diff \| blob \| history
modules/ts/src/ts_func.cpp		diff \| blob \| history
modules/video/doc/motion_analysis_and_object_tracking.rst		diff \| blob \| history
modules/video/include/opencv2/video/background_segm.hpp		diff \| blob \| history
modules/video/src/bgfg_gaussmix.cpp		diff \| blob \| history
modules/video/src/bgfg_gaussmix2.cpp		diff \| blob \| history
modules/video/src/video_init.cpp	[new file with mode: 0644]	blob
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java		diff \| blob \| history
samples/android/CMakeLists.txt		diff \| blob \| history
samples/android/color-blob-detection/.classpath	[new file with mode: 0644]	blob
samples/android/color-blob-detection/.project	[new file with mode: 0644]	blob
samples/android/color-blob-detection/AndroidManifest.xml	[new file with mode: 0644]	blob
samples/android/color-blob-detection/CMakeLists.txt	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/drawable-hdpi/ic_launcher.png	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/drawable-ldpi/ic_launcher.png	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/drawable-mdpi/ic_launcher.png	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/drawable-xhdpi/ic_launcher.png	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/layout/main.xml	[new file with mode: 0644]	blob
samples/android/color-blob-detection/res/values/strings.xml	[new file with mode: 0644]	blob
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java	[new file with mode: 0644]	blob
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java	[new file with mode: 0644]	blob
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/SampleCvViewBase.java	[new file with mode: 0644]	blob
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java		diff \| blob \| history
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java		diff \| blob \| history
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java		diff \| blob \| history
samples/cpp/bgfg_segm.cpp		diff \| blob \| history
samples/cpp/points_classifier.cpp		diff \| blob \| history
samples/cpp/segment_objects.cpp		diff \| blob \| history
samples/cpp/video_dmtx.cpp		diff \| blob \| history
samples/gpu/brox_optical_flow.cpp		diff \| blob \| history
samples/python2/video_dmtx.py	[new file with mode: 0644]	blob

Domain: Multimedia / Uncategorized;

RSS Atom