yao
a1796469f7
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-06 14:39:56 +08:00
yao
1b6639aa3d
A little optimization on ocl/pyrdown, ocl/canny
2012-09-06 14:39:20 +08:00
Vsevolod Glumov
3d072dce02
Revert "Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'."
...
This reverts commit 907a9101eb
.
2012-09-06 10:38:03 +04:00
Vsevolod Glumov
907a9101eb
Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'.
2012-09-05 18:13:54 +04:00
Vadim Pisarevsky
932100c5a3
fixed build errors and warnings on Windows
2012-09-05 17:06:07 +04:00
Vadim Pisarevsky
dcdbc638af
Merge https://github.com/urikz/opencv
2012-09-05 16:01:59 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
Yury Zemlyanskiy
66ce62cd0d
Small fixed #3
2012-09-05 14:39:33 +04:00
Yury Zemlyanskiy
036258b8da
Small fixed #2
2012-09-05 14:36:40 +04:00
Yury Zemlyanskiy
9d1aa37e21
Small fixes
2012-09-05 14:19:44 +04:00
Yury Zemlyanskiy
4e0fdf2205
Merge remote-tracking branch 'itseez/opencv'
...
Conflicts:
modules/video/src/simpleflow.cpp
modules/video/test/test_simpleflow.cpp
2012-09-05 13:40:14 +04:00
Yury Zemlyanskiy
0c10ed26e3
Update to improve performance of SimpleFlow algorithm
...
+ Improve performance of calcOpticalFlowSingleScale method
+ Small refactoring
Current results:
IMAGE NAMES RMSE
Beanbags
Dimetrodon 0.329428
DogDance
Grove2 0.550852
Grove3 1.464699
Hydrangea 0.523277
MiniCooper
RubberWhale 0.367246
Urban2 2.717003
Urban3 4.185070
Venus 0.775422
Walking
Time (for Urban3):
17.490248 sec
2012-09-05 13:27:47 +04:00
Ilya Lavrenov
5eac0419b2
changed eps in validate_result function
2012-09-04 22:22:07 +04:00
Ilya Lavrenov
be51e5d1b1
More strict tests for image waring algorithms
2012-09-04 21:52:40 +04:00
Andrey Kamaev
07d92d9e5a
Fix android build warnings
2012-09-04 17:44:23 +04:00
Andrey Kamaev
8325a28d09
Merge branch 'android-toolchain'
2012-09-04 17:10:52 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Vsevolod Glumov
16717a8641
Partially cleaned 'operations_on_arrays' section of undocumented parameters.
2012-09-04 15:44:21 +04:00
Vadim Pisarevsky
959674618f
restored SSE2 and added AVX optimization of the old haar face detector
2012-09-04 14:59:38 +04:00
Vadim Pisarevsky
dea52eb730
fixed 4-channel resizeAreaFast x2 decimation case
2012-09-04 14:51:31 +04:00
Vadim Pisarevsky
e17b70e533
updated documentation with the new PCA functionality
2012-09-04 14:14:24 +04:00
Kevin
93155c6ae0
Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated
2012-09-04 13:58:59 +04:00
Vadim Pisarevsky
a74a2302aa
fixed bug #2331
2012-09-04 13:34:52 +04:00
yao
8f8a69d6f5
fix bug of ocl::canny
2012-09-04 08:51:08 +08:00
Vadim Pisarevsky
778c31a1c8
added SSE2-optimized boxfilter by Grigoriy Frolov
2012-09-03 17:31:20 +04:00
Vadim Pisarevsky
67ff95083d
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
2012-09-03 17:03:31 +04:00
Andrey Kamaev
6ee7ecb617
Merge pull request #28 : add openexr to 3rdparty libs
2012-09-03 16:03:25 +04:00
niko
11b403900e
add channel 3 for test/main.cpp
...
add remap
2012-09-03 18:07:31 +08:00
yao
c8bfc0fd89
A little fix to ocl accuracy tests, make them more uniformed
2012-09-03 17:23:13 +08:00
yao
0fdb55a54d
update some of the functions in ocl module to the latest version
2012-09-03 17:03:37 +08:00
Andrey Kamaev
577d9cdece
Fix openexr build on MinGW
2012-09-02 20:44:09 +04:00
Andrey Kamaev
941391c0be
Fix openexr build with MSVC
2012-09-02 20:44:07 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
Vsevolod Glumov
ce4ac2d74a
Cleaned 'old_basic_structures' of undocumented parameters.
2012-08-31 19:32:07 +04:00
Alexandre Benoit
37fe2a252a
updated Retina module code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper... compile error corrected
2012-08-31 14:55:32 +02:00
Alexandre Benoit
5a6114e299
updated code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper
2012-08-31 14:14:57 +02:00
Vadim Pisarevsky
e5f9f97954
fixed build warnings on Windows
2012-08-31 14:56:28 +04:00
Yury Zemlyanskiy
1fde184192
Small fixes for SimpleFlow algorithm
...
+ Fixed warnings
+ Add new function calcOpticalFlow with smaller number of arguments
+ Add asserts to algorithm and remove 'exit(1)'
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
784c09d6f9
Updates for SimpleFlow algorithm
...
+ New format for flow data - CV_32C2
+ Memory optimization
+ Cross Bilateral Filter optimization
+ Minor optimizations
+ Sample for calcOpticalFlowSF improved
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
c77d099018
"SimpleFlow" optical flow estimation algorithm (GSoC project) declaration in includes, implementation, usage example, test
2012-08-31 14:39:58 +04:00
Vadim Pisarevsky
2367a195c5
probably fixed compile error on MacOSX 10.6
2012-08-31 14:35:11 +04:00
Yury Zemlyanskiy
7ad4c25452
Small fixes for SimpleFlow algorithm
...
+ Fixed warnings
+ Add new function calcOpticalFlow with smaller number of arguments
+ Add asserts to algorithm and remove 'exit(1)'
2012-08-31 13:34:24 +04:00
Alexandre Benoit
2907eec670
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-31 11:20:13 +02:00
Alexandre Benoit
ffb3842ef1
updated retina documentation
2012-08-31 11:19:46 +02:00
niko
6f6e990988
use mutex provided by opencv itself
...
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
2012-08-31 14:08:52 +08:00
Andrey Kamaev
11e16a7204
Merge pull request #27 from sergiud/master
2012-08-30 23:16:49 +04:00
Alexandre Benoit
9f1c10e1c5
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-30 16:02:48 +02:00
Alexandre Benoit
52b4b5b052
added retina module documentation
2012-08-30 16:02:04 +02:00
Vadim Pisarevsky
014106783d
fixed building BRISK on Windows
2012-08-30 17:32:47 +04:00
Sergiu Dotenco
85eae7b30d
win32: always link to vfw32
2012-08-30 14:52:39 +02:00
Vincent Rabaud
3ca0cc2253
add a scale invariance test for the detector
2012-08-30 16:28:39 +04:00
Vincent Rabaud
84c4797030
revert orientation computation in jeypoint detection for efficiency (like done originally)
2012-08-30 16:28:39 +04:00
Vincent Rabaud
da1921b2fc
add const correctness, replace __inline__ and remote a useless release()
2012-08-30 16:28:39 +04:00
Vincent Rabaud
92da6d381b
add rotation tests for the descriptors
2012-08-30 16:28:39 +04:00
Vincent Rabaud
b325b2f9a4
add more test to BRISK
2012-08-30 16:28:39 +04:00
Vincent Rabaud
13ded36ecb
initial addition of BRISK with some tests
2012-08-30 16:28:39 +04:00
Vincent Rabaud
228070a74c
split FAST in order to reuse it in BRISK
2012-08-30 16:28:38 +04:00
Vadim Pisarevsky
a6e2acbfee
added a few missing images for tutorials; integrated pull request #26
2012-08-30 16:23:18 +04:00
Andrey Kamaev
b2acf50c81
Fix build warning introduced in commit:424bc609b6f352a2b10f2a01ffcd037483e3591f
2012-08-30 13:04:34 +04:00
niko
b929012583
performance fix of convertC3C4
...
add OCL 1.2 feature for setTo
bug fix of integral
replace the error code -217 with suitable MACRO
simplify tests, no need apply a new context for each test case
add more control for tests in utility.hpp
2012-08-30 16:14:35 +08:00
Vladislav Vinogradov
44330afc7f
fixed build without CUDA
2012-08-30 10:35:32 +04:00
Vladislav Vinogradov
29cdddd845
fixed bug in buildPointList
2012-08-30 10:03:19 +04:00
Anatoly Baksheev
3456238c16
minor
2012-08-29 21:26:00 +04:00
noob
fba081992d
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-29 18:14:07 +02:00
noob
424bc609b6
Retina module is now parallelized thanks to the TBB library. Speed increase expected on multicore plateforms
2012-08-29 17:44:21 +02:00
Anatoly Baksheev
0ba01afd83
added GPU bilateral filter + tests
...
added GPU non local means brute force filter + tests
2012-08-29 19:20:32 +04:00
Anatoly Baksheev
a09679044e
renamed device::bilaterl_filter kernel to device::disp_bilaterl_filter for correct naming
...
fixed some warnings
2012-08-29 19:20:32 +04:00
Andrey Kamaev
3d9018f019
Fix run.py version control detection when used outide of OpenCV build
2012-08-29 19:17:18 +04:00
Andrey Kamaev
429e5367c4
Merge pull request #25 from sergiud/master
2012-08-29 17:54:49 +04:00
Vladislav Vinogradov
14694343cb
fixed gpu PyrLKSparse perf test
2012-08-29 10:51:40 +04:00
Sergiu Dotenco
6c3e769f32
eliminated type conversion warnings
2012-08-28 17:21:06 +02:00
Vsevolod Glumov
4d6730dc68
Improved javadoc comments. Minor formatting fix.
2012-08-28 18:51:46 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Corentin Wallez
18fc11bc04
Fix fixed-point arithmetics in FREAK::meanIntensity
2012-08-28 16:57:20 +04:00
Vsevolod Glumov
dc6fa94118
Improved javadoc comments.
2012-08-28 15:49:50 +04:00
Vincent Rabaud
f56432559e
add conversion from/to Matx
2012-08-28 15:13:41 +04:00
Andrey Kamaev
7744b1d600
Android camera: fix logging macro part 2
2012-08-28 15:07:42 +04:00
Vsevolod Glumov
396e4517ff
Improved javadoc comments. Draft.
2012-08-28 15:01:46 +04:00
marina.kolpakova
a07e33609b
added test for caltech images
2012-08-28 14:45:45 +04:00
Vadim Pisarevsky
e2c9e7c3fb
applied patches from #2311
2012-08-28 14:19:34 +04:00
Vadim Pisarevsky
0bd68a70f1
fixed #2297 , #2300 ; fixed several warnings
2012-08-28 13:45:35 +04:00
Andrey Kamaev
95d54196db
Android camera: fix logging macro
2012-08-28 13:30:11 +04:00
Yury Zemlyanskiy
5ee632fe90
Updates for SimpleFlow algorithm
...
+ New format for flow data - CV_32C2
+ Memory optimization
+ Cross Bilateral Filter optimization
+ Minor optimizations
+ Sample for calcOpticalFlowSF improved
2012-08-28 04:16:40 +04:00
Yury Zemlyanskiy
cc6f1eb824
"SimpleFlow" optical flow estimation algorithm (GSoC project)
...
declaration in includes, implementation, usage example, test
2012-08-28 04:16:40 +04:00
Andrey Kamaev
bbbe77e05e
Fix Android build for mips platform
2012-08-27 20:16:54 +04:00
Andrey Kamaev
5c01d13f38
Pass list of modules to javadoc generator
...
Previously the generator always uses hardcoded list of modules.
This fix replaces hardcoded list with actual set of modules coming from cmake.
2012-08-27 16:48:09 +04:00
Vsevolod Glumov
c78884c780
Improved 'Operations on Arrays" section of 'Core' module documentation.
2012-08-24 19:08:18 +04:00
Anatoly Baksheev
4449efb242
minor
2012-08-24 19:01:13 +04:00
Anatoly Baksheev
d3f4c9b2dc
Fixed bug in BP_GPU
2012-08-24 18:38:54 +04:00
Andrey Kamaev
ce11c0d1eb
Fix formatting in detection based tracker
2012-08-24 16:22:18 +04:00
Andrey Kamaev
71df8906be
Android camera: commented logs in frame callback
2012-08-24 16:10:17 +04:00
Andrey Kamaev
ad35f317f6
Fix buffer allocation in Android camera
2012-08-24 16:10:17 +04:00
Alexander Kapustin
1b5903a719
Laplacian tegra optimized was added
2012-08-24 14:36:16 +04:00
Anatoly Baksheev
70204a8e68
Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now
2012-08-24 02:02:42 +04:00
Andrey Kamaev
9be63c50dd
Merge branch 'norm_Matx' of git://github.com/vrabaud/opencv
2012-08-24 00:38:10 +04:00
Vladislav Vinogradov
56b7ddad09
fixed type for threshold parameter
2012-08-23 17:12:44 +04:00
Vladislav Vinogradov
8c1f9bafdc
fixed gpu::integral for Kepler
2012-08-23 17:12:43 +04:00
Vladislav Vinogradov
c3f277b7bc
gpu version of HoughCircles
2012-08-23 17:12:43 +04:00
Anatoly Baksheev
e60a50c43c
removed /EHa flag for cuda compilation
2012-08-23 16:53:53 +04:00
Anatoly Baksheev
290030d030
possibility to enable /mp compiler flag from cmake
...
fixed MCVC warnings
2012-08-23 16:53:53 +04:00
Vincent Rabaud
1baf5209c4
fix the compile bug
2012-08-23 14:20:31 +02:00
Vsevolod Glumov
5648e49d59
Merge remote-tracking branch 'origin/master'
2012-08-23 14:58:41 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
marina.kolpakova
c8a54f67d4
minor warning fix
2012-08-23 13:43:42 +04:00
Anatoly Baksheev
d395bf1522
minor fix in FindTBB
...
added texture_binder
2012-08-23 13:37:27 +04:00
Alexey Spizhevoy
c8b7a8c80c
added median-based version of global motion estimation (videostab)
2012-08-23 10:48:24 +04:00
Leonid Beynenson
6a5d996ca8
Removed the header opencv2/photo/denoising.hpp
...
All the functions from it are moved to the header
opencv2/photo/photo.hpp
2012-08-22 17:51:52 +04:00
Vadim Pisarevsky
e95bc7d502
fixed ios camera timing (patch by Eduard Feicho)
2012-08-22 13:33:13 +04:00
Vladislav Vinogradov
da5aaab277
optimized gpu::integral for Kepler
2012-08-22 12:13:34 +04:00
Ilya Lavrenov
92795ba476
parallel version of remap, resize, warpaffine, warpPerspective. Some optimization for 2x decimation in resize algorithm
2012-08-22 11:49:21 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Vadim Pisarevsky
793e8b546d
fixed build on Ubuntu
2012-08-21 23:11:49 +04:00
Vadim Pisarevsky
64661ea9cd
added SSE2-optimized resizeAreaFast for 8-bit images by Grigoriy Frolov
2012-08-21 23:00:50 +04:00
Andrey Kamaev
a840d929ac
#2170 fix warning of undefined GTEST_HAS_DEATH_TEST
2012-08-21 18:59:51 +04:00
Andrey Kamaev
10dcf9ea39
Fix Java API build
2012-08-21 18:34:02 +04:00
Vadim Pisarevsky
2f1cc018c9
enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays)
2012-08-21 17:39:40 +04:00
Leonid Beynenson
9f016da484
Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means
2012-08-21 16:07:18 +04:00
Victor Passichenko
18de45f7bc
Add CV_Asserts for channels count
2012-08-21 16:05:18 +04:00
Victor Passichenko
92edd4fc6e
Fix building for MS VS C++: remove allocation of arrays of dynamic size in stack
2012-08-21 15:41:51 +04:00
Vadim Pisarevsky
0d2b8f4ba1
fixed the channel ordering of rgba images (by Eduard)
2012-08-21 15:41:05 +04:00
Victor Passichenko
017ab51bf4
Fix wrong memory deallocation
2012-08-21 15:38:38 +04:00
Vladislav Vinogradov
81d6400f45
fixed compilation under windows
2012-08-21 14:28:40 +04:00
Andrey Kamaev
94f7c3c592
Fixed FAST algorithm initializer
2012-08-21 01:03:52 +04:00
Andrey Kamaev
35754c0c03
Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means
2012-08-21 00:23:48 +04:00
Andrey Kamaev
4a1ef53deb
Fixed gcc build warning
2012-08-20 19:53:03 +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
Andrey Kamaev
1a621c2916
Fix build warnings
2012-08-19 19:36:43 +04: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
Andrey Kamaev
ff3aa6cbe1
Fix Android build after commit:41b6d25
2012-08-17 18:28:50 +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
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
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