generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
797143d515
opencv/modules/cudaimgproc/src
History
Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
..
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
bilateral_filter.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
blend.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
canny.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
corners.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cvt_color_internal.h replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
generalized_hough.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
gftt.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
histogram.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hough_circles.cpp Fixed compilation error due to missing std::. 2014-02-19 17:06:33 +01:00
hough_lines.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hough_segments.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
match_template.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
mean_shift.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
mssegmentation.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
precomp.hpp Update precomp.hpp 2014-02-17 09:48:51 +01:00