← Back to branch summary

~gabriel1984sibiu/opencv1/opencv

~gabriel1984sibiu/opencv1/opencv

Viewing all changes in revision 6180.

Committer: Vadim Pisarevsky
Date: 2014-08-12 13:56:17 UTC
mfrom: (6177.1.6)
Revision ID: git-v1:5505aa28ce5700e17599a70156b52546a3cf69ad

Merge pull request #3078 from vpisarev:refactor_features2d_take3

files removed:
modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst

modules/features2d/src/brief.cpp

modules/features2d/src/freak.cpp

modules/features2d/src/generated_16.i

modules/features2d/src/generated_32.i

modules/features2d/src/generated_64.i

modules/features2d/src/stardetector.cpp

modules/nonfree

modules/nonfree/CMakeLists.txt

modules/nonfree/doc

modules/nonfree/doc/feature_detection.rst

modules/nonfree/doc/nonfree.rst

modules/nonfree/include

modules/nonfree/include/opencv2

modules/nonfree/include/opencv2/nonfree

modules/nonfree/include/opencv2/nonfree.hpp

modules/nonfree/include/opencv2/nonfree/cuda.hpp

modules/nonfree/include/opencv2/nonfree/features2d.hpp

modules/nonfree/include/opencv2/nonfree/nonfree.hpp

modules/nonfree/perf

modules/nonfree/perf/perf_main.cpp

modules/nonfree/perf/perf_precomp.hpp

modules/nonfree/perf/perf_surf.cpp

modules/nonfree/perf/perf_surf.cuda.cpp

modules/nonfree/perf/perf_surf.ocl.cpp

modules/nonfree/src

modules/nonfree/src/cuda

modules/nonfree/src/cuda/surf.cu

modules/nonfree/src/nonfree_init.cpp

modules/nonfree/src/opencl

modules/nonfree/src/opencl/surf.cl

modules/nonfree/src/precomp.hpp

modules/nonfree/src/sift.cpp

modules/nonfree/src/surf.cpp

modules/nonfree/src/surf.cuda.cpp

modules/nonfree/src/surf.hpp

modules/nonfree/src/surf.ocl.cpp

modules/nonfree/test

modules/nonfree/test/test_detectors.cpp

modules/nonfree/test/test_features2d.cpp

modules/nonfree/test/test_keypoints.cpp

modules/nonfree/test/test_main.cpp

modules/nonfree/test/test_precomp.hpp

modules/nonfree/test/test_rotation_and_scale_invariance.cpp

modules/nonfree/test/test_surf.cuda.cpp

modules/nonfree/test/test_surf.ocl.cpp

samples/cpp/bagofwords_classification.cpp

samples/cpp/descriptor_extractor_matcher.cpp

samples/cpp/shape_transformation.cpp

samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp

samples/cpp/tutorial_code/features2D/SURF_Homography.cpp

samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp

samples/cpp/tutorial_code/features2D/SURF_detector.cpp

samples/cpp/video_homography.cpp

samples/tapi/surf_matcher.cpp

files modified:
doc/CMakeLists.txt

doc/tutorials/features2d/feature_description/feature_description.rst

doc/tutorials/features2d/feature_detection/feature_detection.rst

doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst

doc/tutorials/features2d/feature_homography/feature_homography.rst

modules/core/doc/basic_structures.rst

modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst

modules/features2d/doc/common_interfaces_of_feature_detectors.rst

modules/features2d/doc/feature_detection_and_description.rst

modules/features2d/doc/features2d.rst

modules/features2d/include/opencv2/features2d.hpp

modules/features2d/src/descriptors.cpp

modules/features2d/src/detectors.cpp

modules/features2d/src/dynamic.cpp

modules/features2d/src/evaluation.cpp

modules/features2d/src/features2d_init.cpp

modules/features2d/src/matchers.cpp

modules/features2d/test/test_descriptors_regression.cpp

modules/features2d/test/test_detectors_regression.cpp

modules/features2d/test/test_keypoints.cpp

modules/java/generator/rst_parser.py

modules/java/generator/src/cpp/features2d_manual.hpp

modules/java/generator/src/cpp/jni_part.cpp

modules/python/common.cmake

modules/stitching/CMakeLists.txt

modules/stitching/doc/matching.rst

samples/cpp/CMakeLists.txt

samples/gpu/CMakeLists.txt

samples/tapi/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

doc/CMakeLists.txt

doc/tutorials/features2d/feature_description/feature_description.rst

doc/tutorials/features2d/feature_detection/feature_detection.rst

doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst

doc/tutorials/features2d/feature_homography/feature_homography.rst

modules/core/doc/basic_structures.rst

modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst

modules/features2d/doc/common_interfaces_of_feature_detectors.rst

modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst

modules/features2d/doc/feature_detection_and_description.rst

modules/features2d/doc/features2d.rst

modules/features2d/include/opencv2/features2d.hpp

modules/features2d/src/brief.cpp

modules/features2d/src/descriptors.cpp

modules/features2d/src/detectors.cpp

modules/features2d/src/dynamic.cpp

modules/features2d/src/evaluation.cpp

modules/features2d/src/features2d_init.cpp

modules/features2d/src/freak.cpp

modules/features2d/src/generated_16.i

modules/features2d/src/generated_32.i

modules/features2d/src/generated_64.i

modules/features2d/src/matchers.cpp

modules/features2d/src/stardetector.cpp

modules/features2d/test/test_descriptors_regression.cpp

modules/features2d/test/test_detectors_regression.cpp

modules/features2d/test/test_keypoints.cpp

modules/java/generator/rst_parser.py

modules/java/generator/src/cpp/features2d_manual.hpp

modules/java/generator/src/cpp/jni_part.cpp

modules/nonfree/

modules/nonfree/CMakeLists.txt

modules/nonfree/doc/

modules/nonfree/doc/feature_detection.rst

modules/nonfree/doc/nonfree.rst

modules/nonfree/include/

modules/nonfree/include/opencv2/

modules/nonfree/include/opencv2/nonfree.hpp

modules/nonfree/include/opencv2/nonfree/

modules/nonfree/include/opencv2/nonfree/cuda.hpp

modules/nonfree/include/opencv2/nonfree/features2d.hpp

modules/nonfree/include/opencv2/nonfree/nonfree.hpp

modules/nonfree/perf/

modules/nonfree/perf/perf_main.cpp

modules/nonfree/perf/perf_precomp.hpp

modules/nonfree/perf/perf_surf.cpp

modules/nonfree/perf/perf_surf.cuda.cpp

modules/nonfree/perf/perf_surf.ocl.cpp

modules/nonfree/src/

modules/nonfree/src/cuda/

modules/nonfree/src/cuda/surf.cu

modules/nonfree/src/nonfree_init.cpp

modules/nonfree/src/opencl/

modules/nonfree/src/opencl/surf.cl

modules/nonfree/src/precomp.hpp

modules/nonfree/src/sift.cpp

modules/nonfree/src/surf.cpp

modules/nonfree/src/surf.cuda.cpp

modules/nonfree/src/surf.hpp

modules/nonfree/src/surf.ocl.cpp

modules/nonfree/test/

modules/nonfree/test/test_detectors.cpp

modules/nonfree/test/test_features2d.cpp

modules/nonfree/test/test_keypoints.cpp

modules/nonfree/test/test_main.cpp

modules/nonfree/test/test_precomp.hpp

modules/nonfree/test/test_rotation_and_scale_invariance.cpp

modules/nonfree/test/test_surf.cuda.cpp

modules/nonfree/test/test_surf.ocl.cpp

modules/python/common.cmake

modules/stitching/CMakeLists.txt

modules/stitching/doc/matching.rst

samples/cpp/CMakeLists.txt

samples/cpp/bagofwords_classification.cpp

samples/cpp/descriptor_extractor_matcher.cpp

samples/cpp/shape_transformation.cpp

samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp

samples/cpp/tutorial_code/features2D/SURF_Homography.cpp

samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp

samples/cpp/tutorial_code/features2D/SURF_detector.cpp

samples/cpp/video_homography.cpp

samples/gpu/CMakeLists.txt

samples/tapi/CMakeLists.txt

samples/tapi/surf_matcher.cpp

Older »