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

11635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Donchenko
8c15d27619 Merge pull request #1525 from asmorkalov:ocv_custom_libv4l 2013-10-01 19:40:12 +04:00
Roman Donchenko
bcb6f0386e Named FastFeatureDetector::Type to allow its use in makePtr. 
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278>.
 2013-10-01 18:22:03 +04:00
Ilya Lavrenov
4322c47bb2 removed test_norm.cpp from ocl tests 2013-10-01 17:53:14 +04:00
Roman Donchenko
4d88a6e856 Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing 2013-10-01 17:39:18 +04:00
Roman Donchenko
6133aeede8 Merge branch 'master' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
 2013-10-01 17:37:05 +04:00
Roman Donchenko
8717281e0e Merge pull request #1209 from nghiaho12:master 2013-10-01 17:07:39 +04:00
Alexander Alekhin
a8ac3ec72a ocl: perf test: disable MOG2 (random hungs), enable upload/download 2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97 perf tests: added SANITY_CHECK_NOTHING() 2013-10-01 16:49:11 +04:00
Roman Donchenko
aeedc7adec Emergency fix: rename a conflicting label in the tutorials. 2013-10-01 16:10:40 +04:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
 2013-10-01 15:57:33 +04:00
Roman Donchenko
4ec5c04504 Merge pull request #1315 from dbloisi:add_bs_tutorial 2013-10-01 15:29:38 +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
Nghia Ho
61f5176bad Removed trailing whitespace 2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a Merge remote-tracking branch 'upstream/master' 2013-10-01 19:56:47 +10:00
Ilya Lavrenov
065b40c6c3 fixed and extended ocl::norm 2013-10-01 13:21:43 +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
e1aa2fd06c added gridMinMaxLoc function 2013-10-01 12:18:39 +04:00
Vladislav Vinogradov
3fb9c52272 cast to reference 2013-10-01 12:18:38 +04:00
Vladislav Vinogradov
bbd519be42 fixed warnings 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
9fe92e2111 renamed grid/glob_reduce.hpp -> grid/reduce.hpp 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
32d578f5f0 fixed gridTransform overloads problems 2013-10-01 12:18:35 +04:00
Vladislav Vinogradov
f4fb7fe1be fixed compilation error "ambiguous symbol" on CUDA 5.0: 
disabled Texture Reference API for old CUDA toolkits
 2013-10-01 12:15:30 +04:00