Andrey Kamaev
35754c0c03
Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means
2012-08-21 00:23:48 +04:00
marina.kolpakova
ee0dd4d496
disabled -Wunused-but-set-variable because of multiple warnings during building nvcc auto generated files (GCC 4.6)
2012-08-20 23:35:59 +04:00
Andrey Kamaev
682dede87e
#2215 Fix dependencies escaping in generated OpenCVConfig.cmake
2012-08-20 19:53:03 +04:00
Andrey Kamaev
4a1ef53deb
Fixed gcc build warning
2012-08-20 19:53:03 +04:00
Vadim Pisarevsky
d8b69d750d
some tweaks in optimization flags for opencv2.framework
2012-08-20 19:46:52 +04:00
Vadim Pisarevsky
8efb84b5a4
added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232 )
2012-08-20 19:36:36 +04:00
Vladislav Vinogradov
c26d543e1e
gpu::HoughLines : minor code improvements
2012-08-20 16:03:01 +04:00
marina.kolpakova
1e4012079d
removed logging from test
2012-08-20 13:26:51 +04:00
Vladislav Vinogradov
3956e42507
Merge branch 'gpu-tests'
2012-08-20 11:29:40 +04:00
Vladislav Vinogradov
ec7f9566e0
minor gpu tests fix
2012-08-20 10:15:36 +04:00
Vladislav Vinogradov
a0aef244d6
removed perf_gpu_cpu from CMake scripts
2012-08-20 09:58:37 +04:00
niko
e7f4dd1a2e
temp build fix because the new core.hpp impact on this project
2012-08-20 10:06:41 +08:00
marina.kolpakova
f17f4bda60
more warning fixes for GCC
2012-08-20 03:26:53 +04:00
marina.kolpakova
1521340152
updated CascadeClassifier_GPU documentation
2012-08-20 03:25:52 +04:00
marina.kolpakova
ede3781e3e
fixed -Wstrict_alliasing warning for GCC
2012-08-20 02:27:54 +04:00
marina.kolpakova
aeaf1a6f6d
refactoring in Emulation
2012-08-20 02:26:23 +04:00
marina.kolpakova
9c13b84e35
fixed unused warnings
2012-08-20 00:06:12 +04:00
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
Victor Passichenko
1f42de39a3
Add non-local means denoising algorithm implementatation into photo module
2012-08-19 13:13:58 +04: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
Vladislav Vinogradov
a507d564a4
merged gpu_perf_cpu into gpu_perf
2012-08-17 17:34:58 +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
Vladislav Vinogradov
93172bab87
added --cpu flag (run tests on CPU)
2012-08-17 16:12:32 +04:00
Vladislav Vinogradov
00546f24e0
updated mark_nvidia.py script
2012-08-17 15:50:35 +04:00
Vladislav Vinogradov
2634dc6cce
removed license comments
2012-08-17 15:22:29 +04:00
Vladislav Vinogradov
362df96cb9
renamed perf_main.cpp to main.cpp
2012-08-17 15:16:45 +04:00
Vladislav Vinogradov
6e4eb722a6
updated gpu performance tests
...
now it executes only on one device
added posibility to specify device on which tests will be executed
2012-08-17 15:14:14 +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
ddca47040b
updated gpu accuracy tests
...
added posibility to specify device on which tests will be executed
2012-08-16 16:23:27 +04: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
