Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

2013-08-27 13:26:44 +04:00

..

all_indices.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

allocator.h

Warning fixes continued

2012-06-09 15:00:04 +00:00

any.h

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

autotuned_index.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

composite_index.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

config.h

Fixing ticket #1230

2011-07-18 21:57:28 +00:00

defines.h

Exposed HierarchicalClusteringIndex in OpenCV wrapper

2012-09-27 03:58:17 -07:00

dist.h

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

dummy.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

dynamic_bitset.h

Warning fixes continued

2012-06-09 15:00:04 +00:00

flann_base.hpp

Remove all include directives for <string>

2013-03-22 22:14:47 +04:00

flann.hpp

Added compatibility headers

2013-03-13 17:26:56 +04:00

general.h

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

ground_truth.h

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

hdf5.h

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

heap.h

Warning fixes continued

2012-06-09 15:00:04 +00:00

hierarchical_clustering_index.h

Remove all include directives for <string>

2013-03-22 22:14:47 +04:00

index_testing.h

Fixed mingw build.

2012-06-08 03:15:08 +00:00

kdtree_index.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

kdtree_single_index.h

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

kmeans_index.h

Remove all include directives for <string>

2013-03-22 22:14:47 +04:00

linear_index.h

fixed hundreds of warnings from MSVC 2010.

2012-03-16 21:21:04 +00:00

logger.h

Fixing include defines

2011-09-12 20:20:49 +00:00

lsh_index.h

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

lsh_table.h

Make core/internal.hpp a private header

2013-04-01 17:29:10 +04:00

matrix.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

miniflann.hpp

Make flann headers independent from OpenCV C API

2013-04-08 15:47:29 +04:00

nn_index.h

Remove all include directives for <string>

2013-03-22 22:14:47 +04:00

object_factory.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

params.h

Compile opencv_test_core with cv::String instead of std::string

2013-03-22 22:14:22 +04:00

random.h

Normalized file endings.

2013-08-21 18:59:25 +04:00

result_set.h

Normalized file endings.

2013-08-21 18:59:25 +04:00

sampling.h

fixed hundreds of warnings from MSVC 2010.

2012-03-16 21:21:04 +00:00

saving.h

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

2011-07-19 12:27:07 +00:00

simplex_downhill.h

upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

2011-07-13 23:04:39 +00:00

timer.h

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00