mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-26 10:48:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,127 Commits 6 Branches 127 Tags 3 GiB
63c23cce65
Commit Graph

147 Commits

Author SHA1 Message Date
Vadim Pisarevsky
d0b3c7a518 added some diagnostic into Tonemap test 2013-11-18 23:14:44 -05:00
Anatoly Baksheev
e154bce259 fixed compilation for vs2008 2013-11-17 14:13:13 +04:00
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Fedor Morozov
c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Fedor Morozov
f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Fedor Morozov
90b6af1496 Merge new changes 2013-09-18 18:21:45 +04:00
Fedor Morozov
b1af5cc478 Remove ghost removal 2013-09-18 18:15:51 +04:00
Fedor Morozov
89508bf7ab NO exr now 2013-09-17 00:46:15 +04:00
Fedor Morozov
76c6fa9348 No EXR in tests 2013-09-17 00:39:22 +04:00
Fedor Morozov
a7bcf63765 Robertson docs 2013-09-06 18:21:59 +04:00
Fedor Morozov
c118f3c529 Robertson update 2013-09-06 17:30:43 +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
Fedor Morozov
deeaddb0a9 Doc update 2013-09-06 14:49:19 +04:00
Fedor Morozov
f4792f8a44 Doc update 2013-09-06 14:43:04 +04:00
Roman Donchenko
32205d3c5b Boring changes - photo. 2013-09-05 19:02:58 +04:00
Fedor Morozov
e33a4f79f8 Merge branch 'devel' of https://github.com/f-morozov/opencv into devel 2013-09-05 14:49:18 +04:00
Fedor Morozov
85eb52b8af Debevec Calibrate 2013-09-05 14:41:35 +04:00
fm
cb27740de4 Linux compilation 2013-09-05 14:26:21 +04:00
Fedor Morozov
0f703b8162 Calibrate Debevec changes 2013-09-05 14:10:53 +04:00
Alexander Shishkov
924f7ce373 small changes for compilation 2013-09-03 14:05:14 +04:00
Fedor Morozov
e15eabe3fa Ghostbusters 2013-09-02 16:03:10 +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
a0ae602bb7 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6 renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
8282f6ebc1 renamed gpu::cudev namespace -> cuda::device 
cudev is used for new device layer
 2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00
Fedor Morozov
9f9873017c HDR test changes 2013-08-28 02:17:49 +04:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
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
Fedor Morozov
833f8d16fa Robertson and tutorial 2013-08-26 15:23:37 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Vladislav Vinogradov
9f33de7071 added cvconfig.hpp header file to gpu tests 
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
 2013-08-19 12:46:57 +04:00
Roman Donchenko
2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
abidrahmank
92d04d439e docs changes 2013-08-13 21:58:49 +05:30
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +04:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
Fedor Morozov
19082e0504 Documentation update 2013-08-07 11:15:41 +04:00
Fedor Morozov
3725c1fb4c Documentation updates 2013-08-06 18:13:34 +04:00
Fedor Morozov
e914fc2471 Merge branch 'master' of https://github.com/f-morozov/opencv 2013-08-06 17:49:29 +04:00
Fedor Morozov
4a4c5190f0 Documentation updates 2013-08-06 17:49:02 +04:00
Alexander Shishkov
3c218717a9 Merge branch 'master' of https://github.com/f-morozov/opencv 2013-08-06 15:41:39 +04:00
Alexander Shishkov
c4fb0e9dbb few changes for compilation 2013-08-06 15:41:32 +04:00