Commit Graph

6477 Commits

Author SHA1 Message Date
yao
0f4bdcd708 Merge branch 'master' of git://code.opencv.org/opencv 2012-08-08 17:13:30 +08:00
yao
2fed1fcbff add an ocl sample 2012-08-08 17:12:53 +08:00
niko
37ca6d378b add performance test code for ocl module 2012-08-08 17:09:29 +08:00
yao
64e9cf5d75 add SURF and HOG to ocl module 2012-08-08 15:55:39 +08:00
Alexander Mordvintesv
a2df490914 added CV_IN_OUT to img argument of drawing functions 2012-08-08 11:18:52 +03:00
Alexey Spizhevoy
8c3984c5ff Refactored the DP based seam finder 2012-08-07 23:55:06 +04:00
Alexander Mordvintesv
7db1f711f6 Merge branch 'master' of code.opencv.org:opencv
Conflicts:
	samples/python2/common.py
	samples/python2/feature_homography.py
	samples/python2/plane_ar.py
	samples/python2/plane_tracker.py
2012-08-07 23:21:56 +03:00
Alexander Mordvintesv
647b1dd96c comment fixed 2012-08-07 23:19:13 +03:00
Alexander Mordvintesv
a29be81d77 typo fix in features_homography.py 2012-08-07 21:37:46 +03:00
Alexander Mordvintesv
0998669d26 Revert "fixed LshIndex types in its constructor"
This reverts commit 54d68da8e7.
2012-08-07 21:37:19 +03:00
Alexander Mordvintesv
0adf68ae62 work on #2100: pyopencv_to functions now can receive argument information through ArgInfo structure. Non-contiguous input numpy arrays are copied. In case of non-contiguous output array the TypeError is thrown. 2012-08-07 21:03:17 +03:00
Vadim Pisarevsky
e2eb81bcb2 Merge remote-tracking branch 'origin/master' 2012-08-07 18:17:49 +04:00
marina.kolpakova
fc8c65ff15 HAVE_CUDA macro 2012-08-07 18:23:18 +04:00
marina.kolpakova
8e274c886c Greedy Labeling implementation in correctness test 2012-08-07 18:23:18 +04:00
marina.kolpakova
e8e7b94443 test fix 2012-08-07 18:23:18 +04:00
Vadim Pisarevsky
36d3bbff8b added description of FAST 5/8 and FAST 7/12 (by Vincent) 2012-08-07 18:17:30 +04:00
Vadim Pisarevsky
bcb499328d Merge remote-tracking branch 'origin/master' 2012-08-07 18:00:10 +04:00
Andrey Kamaev
8aa2d6cddc Fix several documentation build warnings 2012-08-07 18:00:09 +04:00
Vadim Pisarevsky
4b5f948307 added SSE2-optimized 3x3 invert by Grigoriy Frolov 2012-08-07 17:59:52 +04:00
Andrey Pavlenko
c1571e21ff android tutorial v2, initial draft commit 2012-08-07 17:27:48 +04:00
alexey.spizhevoy
43d46c0e8b Minor fix in the DP based seam estimator 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
7222f2724f Fixed bug 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
85d1c463b9 Minor changes 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
897c2bbd14 Added support of 8UC3 2012-08-07 16:24:21 +04:00
alexey.spizhevoy
a39bce204d implemented DP-based seam estimation method 2012-08-07 16:24:21 +04:00
Vladislav Vinogradov
cd58b7e154 Merge branch 'master' of code.opencv.org:opencv 2012-08-07 16:09:04 +04:00
Vladislav Vinogradov
76d46e20de fixed build with CUDA 4.2 2012-08-07 16:08:22 +04:00
Andrey Kamaev
ce9b97c78c Fixed number of svn->git migration issues 2012-08-07 14:32:57 +04:00
Andrey Kamaev
5100ca7508 svn repository web references are replaced with links to git 2012-08-07 14:30:36 +04:00
Andrey Kamaev
a3527fc4d8 Add git support to run.py 2012-08-07 14:30:36 +04:00
Andrey Kamaev
bd33e166d0 Use git hash instead of svn version in cmake status report 2012-08-07 14:30:36 +04:00
Andrey Kamaev
1852cb7eab Fix tegra build warnings 2012-08-07 14:29:51 +04:00
Vladislav Vinogradov
8624d18ca5 new implementation of gpu debayer
* without border extrapolation
* with aligned write
* process 4 pixels per thread in 8u case
2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
5ce896d9ee added perf tests for new gpu::cvtColor functions 2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
b0461db43f added missed device synchronization 2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
7b025474e2 added debayer to gpu::cvtColor 2012-08-07 13:34:11 +04:00
marina.kolpakova
c0d3adef25 intervales for vector type support 2012-08-07 13:22:41 +04:00
marina.kolpakova
0bf10c9a47 added connectivityMask calculation function 2012-08-07 13:22:41 +04:00
marina.kolpakova
a9764dd910 fixed not defined macro warningds 2012-08-07 13:22:41 +04:00
marina.kolpakova
51433a9331 C.C. Labeling: added stream support 2012-08-07 13:22:41 +04:00
marina.kolpakova
350621057f connected components labeling 2012-08-07 13:22:41 +04:00
marina.kolpakova
2c8d11071c minor in license file 2012-08-07 13:22:41 +04:00
Vadim Pisarevsky
0d5c694ec4 Merge remote-tracking branch 'origin/master' 2012-08-07 12:54:22 +04:00
yao
c03ac12fcd Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries 2012-08-07 16:33:46 +08:00
yao
7741d585f5 Merge branch 'master' of git://code.opencv.org/opencv 2012-08-07 08:37:38 +08:00
Andrey Kamaev
50d13ba5c4 Fixed xml name generation in run.py 2012-08-06 19:10:55 +04:00
Andrey Kamaev
9981b283a6 Fixed build warnings (including error in FAST) 2012-08-06 19:10:55 +04:00
Andrey Kamaev
fdc48abd18 Added ignore for tbb source tarballs 2012-08-06 19:10:55 +04:00
Andrey Kamaev
bc227ab075 Intermediate files generated by Android toolchain are moved into CMakeFiles subfolder 2012-08-06 19:10:55 +04:00
Alexander Mordvintesv
a717b7cbed Merge branch 'master' of code.opencv.org:opencv 2012-08-06 17:17:13 +03:00