78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
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
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
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
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
2013-08-20 14:10:22 +04:00
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
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
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
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
fee8121040
Added regression tests for SURF/SIFT (related to #2892 )
2013-06-14 17:08:01 +04:00
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d02131ffb62
2013-04-18 15:03:50 +04:00
12f16b7a26
nonfree module fixes
2013-04-18 12:36:11 +04:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
913e6833d5
Merge pull request #785 from taka-no-me:split_c_cpp2
2013-04-09 08:53:50 +04:00
1bb141c465
fixed build
2013-04-08 17:25:15 +04:00
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
642d7d6826
fixed nonfree test (run it only on one gpu device)
2013-04-02 13:24:39 +04:00
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
84f45e1e03
fixed build with CUDA after latest merge
2013-03-25 08:08:36 +04:00
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
7b8ad4cb04
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
2013-03-21 18:18:15 +04:00
dd678121b3
Trying to make ocl surf work
...
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
2013-03-21 18:16:59 +04:00
1be58f9a00
SURF accuracy test is moved to nonfree
2013-03-21 18:15:46 +04:00
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
e3b45910aa
Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test
2013-01-31 16:06:22 +04:00
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
1f261c2f9d
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.
2013-01-30 18:07:37 +04:00
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
9f0d5f60b5
fixinf warning on non-Windows systems
2013-01-14 18:15:51 +04:00
8e42ca1764
SURF keypoints rotation invariance test.
...
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
2013-01-14 14:06:00 +04:00
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Roman Donchenko