mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-12 15:19:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
e2f00ce846
opencv/samples/python2
History
Roman Donchenko bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
..
data added texture_flow.py sample 2012-08-19 20:36:50 +03:00
_coverage.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
_doc.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
asift.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
browse.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
calibrate.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
camshift.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
coherence.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
color_histogram.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
common.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
contours.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
deconvolution.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
demo.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
dft.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
digits_adjust.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
digits_video.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
digits.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
distrans.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
edge.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
facedetect.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
facerec_demo.py Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
feature_homography.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
find_obj.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
fitline.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
floodfill.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
gabor_threads.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
gaussian_mix.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
grabcut.py ANDed waitkey result with 0xFF for x64 systems 2013-05-27 10:30:30 +05:30
hist.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
houghcircles.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
houghlines.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
inpaint.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
kmeans.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
lappyr.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
letter_recog.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
lk_homography.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
lk_track.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
morphology.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
mosse.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
motempl.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
mouse_and_match.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
mser.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
opt_flow.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
peopledetect.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
plane_ar.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
plane_tracker.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
squares.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
stereo_match.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
texture_flow.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
turing.py Drop old python samples and tests 2013-04-12 19:37:40 +04:00
video_dmtx.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
video_threaded.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
video.py Fixed typo 2013-05-05 16:17:41 +04:00
watershed.py Merge branch '2.4' 2013-04-12 15:35:38 +04:00