mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,737 Commits 6 Branches 126 Tags 3 GiB
6d4c4dcd94
Commit Graph

45 Commits

Author SHA1 Message Date
Andrey Pavlenko
724f5e7f19 Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
Vladislav Vinogradov
f1e44fa5ca fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
Roman Donchenko
db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
 2014-03-03 13:45:22 +04:00
Roman Donchenko
72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
 2014-02-11 12:05:01 +04:00
Roman Donchenko
cdc10defa3 Merge commit '05b9c991dd' into merge-2.4 
Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp
 2013-12-30 17:30:59 +04:00
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
Roman Donchenko
4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
 2013-11-11 16:55:36 +04:00
Vladislav Vinogradov
8ed47c01b7 used new device layer for cv::cuda::norm 2013-10-01 15:28:51 +04:00
Vladislav Vinogradov
23cc31e041 used new device layer for cv::cuda::LUT 2013-10-01 15:24:17 +04:00
Vladislav Vinogradov
06f07944c8 removed dependecy from cudalegacy 2013-10-01 12:18:40 +04:00
Vladislav Vinogradov
7839dbd2c4 used new device layer for cv::gpu::integral 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
224f18b06c bitwise operation optimization 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
eb449968b6 removed unroll_detail.hpp 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
1ef211b889 used new device layer for cv::gpu::reduce 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
31a7814395 used new device layer for cv::gpu::countNonZero 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
020624c481 used new device layer for cv::gpu::minMaxLoc 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
3fb9c52272 cast to reference 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
045a856c24 used new device layer for cv::gpu::minMax 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
b705e0d886 used new device layer for cv::gpu::sum 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
e820c5c65f used new device layer for cv::gpu::mulSpectrums 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
3f62e78592 used new device layer for cv::gpu::copyMakeBorder 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
7b3bbcea71 used new device layer for cv::gpu::transpose 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
6dbb32a05d switched to new device layer in split/merge 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
3ab7f4b26a removed arithm_func_traits.hpp 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
7c8c836a7b switched to new device layer in polar <-> cart 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
5522f43b18 used new device layer for cv::gpu::threshold 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
e83be009a3 used new device layer for cv::gpu::addWeighted 2013-10-01 12:18:37 +04:00
Vladislav Vinogradov
c7a3a7d4d9 switched to new device layer in min/max 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
b11cccaaca switched to new device layer in bitwize operations 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
fdfffa5291 fixed warnings 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
ef9917ecf1 used new device layer for cv::gpu::compare 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
43e811118b fixed assertion 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
766d950ff3 used new device layer in math per element operations 2013-10-01 12:18:36 +04:00
Vladislav Vinogradov
7628e57fc6 used new device layer for cv::gpu::absdiff 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
574ff47146 used new device layer for cv::gpu::divide 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
e7dba695b3 used new device layer for cv::gpu::multiply 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
156f86ea0b used new device layer for cv::gpu::subtract 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
9c5da2ea22 used new device layer for cv::gpu::add 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-06 15:44:44 +04:00
Vladislav Vinogradov
429bfad225 removed precomp.cpp files 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e fixed docs 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc renmaed gpu module -> cuda 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00