marina.kolpakova
66eb96d719
minor warning fix
2012-08-19 22:43:27 +04:00
Alexander Mordvintesv
122f59560c
Merge branch 'master' of code.opencv.org:opencv
2012-08-19 20:37:10 +03:00
Alexander Mordvintesv
c9f2ff4487
added texture_flow.py sample
2012-08-19 20:36:50 +03:00
Andrey Kamaev
1a621c2916
Fix build warnings
2012-08-19 19:36:43 +04:00
Andrey Kamaev
7d2b7b801a
Merge branch 'sergiud_vs2012rtm_support'
2012-08-19 17:49:54 +04:00
Sergiu Dotenco
ddc7bd7659
fixed compilation errors caused by std::tuple
2012-08-19 15:30:41 +02:00
Sergiu Dotenco
4993748c91
added missing includes
2012-08-19 15:25:07 +02:00
Andrey Kamaev
8e2258c494
Fix Windows build after commit:41b6d25
2012-08-19 00:20:08 +04:00
Alexander Mordvintesv
4c15465fbb
Merge branch 'master' of code.opencv.org:opencv
2012-08-18 19:43:46 +03:00
Alexander Mordvintesv
a4bffd96c4
added deconvolution.py sample and example images
2012-08-18 19:43:32 +03:00
Andrey Kamaev
bf4c1df0d0
Fix formatting in Android tutorials
2012-08-17 19:23:45 +04:00
Andrey Kamaev
ff3aa6cbe1
Fix Android build after commit:41b6d25
2012-08-17 18:28:50 +04:00
Andrey Kamaev
9d6ccecfdd
Fixed layout in third Android tutorial
2012-08-17 18:15:15 +04:00
Andrey Kamaev
915169e8b7
Fix documentation build warnings in gpu module reference
2012-08-17 18:15:15 +04:00
Vadim Pisarevsky
ec8f926686
small correction for the previous patch in parallel.cpp
2012-08-17 17:34:51 +04:00
Vadim Pisarevsky
38ea339990
Merge remote-tracking branch 'origin/master'
2012-08-17 17:32:20 +04:00
Vadim Pisarevsky
41b6d25bdd
added cross-platform Mutex implementation; enable platform-native (GDC/Concurrency) parallel_for_ implementation when TBB is not installed.
2012-08-17 17:32:06 +04:00
Andrey Kamaev
6da9b9f137
Android toolchain: libstdc++ and libsupc are removed from explicit link libraries
...
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
# (use "git reset HEAD^1 <file>..." to unstage)
#
# modified: android/android.toolchain.cmake
#
2012-08-17 16:23:57 +04:00
niko
2e685dcf0a
performance & bug fix for resize erode dilate sobel remap
2012-08-17 15:47:02 +08:00
Alexander Smorkalov
a1d8091e10
ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed.
2012-08-16 16:52:53 +04:00
bitwangyaoyao
a091f9e4e2
bug fix of "squares" sample for ocl module
2012-08-16 20:34:24 +08:00
Vladislav Vinogradov
cfdeb50335
updated mark_nvidia.py script
2012-08-16 12:54:00 +04:00
yao
d363d5589c
add an "squares" sample for ocl module
2012-08-16 16:01:40 +08:00
Vladislav Vinogradov
19462c871d
Forbid incorrect patchSize values in gpu::ORB
2012-08-15 17:24:53 +04:00
Vladislav Vinogradov
528ddb5647
fixed block size for old CC
2012-08-15 17:24:53 +04:00
Andrey Kamaev
65f8585630
#2229 Fix FREAK build on CentOS
2012-08-15 17:23:07 +04:00
Andrey Kamaev
859ee6087c
#2216 Forbid incorrect patchSize values in ORB
2012-08-15 16:54:40 +04:00
Andrey Kamaev
b0927397e9
#2225 Rename getConvertData to getConvertElem to match the headers and documentation
2012-08-15 15:34:33 +04:00
Vsevolod Glumov
e578259a34
Merge remote-tracking branch 'origin/master'
2012-08-15 15:12:48 +04:00
Vsevolod Glumov
8899835886
Reviewed 'android_dev_intro'
2012-08-15 15:10:58 +04:00
Vladislav Vinogradov
a9fba14898
added docs for gpu::HoughLines
2012-08-15 15:07:30 +04:00
Vladislav Vinogradov
97731c152d
fixed typo
2012-08-15 15:07:29 +04:00
Vladislav Vinogradov
db79022b85
fixed shared memory size for linesAccumShared
2012-08-15 15:07:29 +04:00
Andrey Kamaev
36fe62d7a5
#2245 Fix BFMatcher::radiusMatchImpl witch Hamming distance (thanks to Jukka Holappa)
2012-08-15 15:02:20 +04:00
Vladislav Vinogradov
456890e9e4
fixed warning C4512
2012-08-15 13:48:28 +04:00
Vladislav Vinogradov
647d4ae1f1
Merge branch 'hough-lines-gpu'
2012-08-15 13:24:46 +04:00
Vladislav Vinogradov
7928cec670
added linesAccumGlobal kernel
2012-08-15 13:18:35 +04:00
Andrey Pavlenko
3b07e977a9
improving android tutorial v2
2012-08-15 12:21:58 +04:00
Andrey Pavlenko
6e07a1346c
improving android tutorial v2
2012-08-15 11:47:48 +04:00
Vsevolod Glumov
a4392e4906
Merge remote-tracking branch 'origin/master'
2012-08-15 11:39:54 +04:00
Vsevolod Glumov
5825c60491
Reviewed 'android_dev_intro' and 'O4A_SDK'
2012-08-15 11:39:02 +04:00
Andrey Pavlenko
c004df234f
improving android tutorial v2, removing v1
2012-08-15 10:56:50 +04:00
Vladislav Vinogradov
7ae94c571c
fixed build without cuda
2012-08-14 17:54:42 +04:00
Vladislav Vinogradov
34b9bd61a2
fixed failure
2012-08-14 17:42:15 +04:00
Andrey Kamaev
d861063159
Fixed tutorial link to NVIDIA Tegra platform
2012-08-14 17:26:00 +04:00
Andrey Pavlenko
37740fa30e
improving android tutorial v2
2012-08-14 17:18:24 +04:00
Maria Dimashova
d973d571a4
changed the value that replace NaNs in bilateralFilter_32f
2012-08-14 17:15:03 +04:00
Vladislav Vinogradov
c3fa7974e6
new optimized version
2012-08-14 17:00:57 +04:00
Daniil Osokin
f1d41d8b94
disabled whole perf test for distance transform
2012-08-14 13:01:52 +04:00
Vladislav Vinogradov
9201db32eb
fixed overflow bugs, updated perf tests
2012-08-14 12:33:47 +04:00
