opencv/modules/contrib/src
Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
2013-12-03 17:35:21 +04:00
..
adaptiveskindetector.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ba.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
bowmsctrainer.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
chamfermatching.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
chowliutree.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
colormap.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
colortracker.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
contrib_init.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
detection_based_tracker.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
facerec.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
featuretracker.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-22 14:28:00 +04:00
fuzzymeanshifttracker.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
gencolors.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
hybridtracker.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
inputoutput.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
lda.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
logpolar_bsm.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
octree.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
openfabmap.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
polyfit.cpp this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy 2013-09-30 16:00:39 +04:00
precomp.hpp Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
rgbdodometry.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
selfsimilarity.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
spinimages.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
stereovar.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00