Commit Graph

3873 Commits

Author SHA1 Message Date
Vadim Pisarevsky
40d5b026c7 fixed verbose mode in highgui's DirectShow wrapper (bug #2350) 2012-09-19 16:57:10 +04:00
Andrey Kamaev
56ac2937d8 Fix typo 2012-09-19 16:56:54 +04:00
Vadim Pisarevsky
54705a009a Merge remote-tracking branch 'origin/master' 2012-09-19 16:52:07 +04:00
Vadim Pisarevsky
c3c49a317b fixed outlier filtering in cvStereoRectifyUncalibrated (bug #2367) 2012-09-19 16:51:49 +04:00
Andrey Kamaev
f42b38ac44 Refactor fast NL-means denoising
* reorder arguments
* rewrite accuracy tests
* replace doubles with integer arithmetic inside the main loop
2012-09-19 16:50:56 +04:00
Vadim Pisarevsky
4e07561141 fixed possible compile error in cap_ffmpeg_impl.hpp (bug #2365) 2012-09-19 16:48:19 +04:00
yao
d38359620e some optimizations to ocl::blend 2012-09-19 10:52:25 +08:00
Oleg Sklyarov
bbe418427e Added WQHD = 1444p frame size 2012-09-18 18:02:29 +04:00
Vadim Pisarevsky
2d334401b1 improved the condition in the FAST test 2012-09-18 14:34:50 +04:00
Vadim Pisarevsky
d2613dd9f6 added patches by Bram Bolder 2012-09-18 14:11:08 +04:00
yao
310bd8701c a little optimizations to ocl::pyrDown 2012-09-18 17:57:37 +08:00
Ilya Lavrenov
fffd263ce4 attempt 2012-09-17 19:39:49 +04:00
Ilya Lavrenov
f58c5646b0 fixed wrong condition with interpolation types 2012-09-17 18:30:55 +04:00
Ilya Lavrenov
5ab3fe489f changed resize_area test 2012-09-17 17:38:23 +04:00
Andrey Kamaev
7e35838849 Minor refactoring of NL-means denoising 2012-09-17 17:19:00 +04:00
Ilya Lavrenov
a65cb5d2de added extra debug parameters in resize test 2012-09-17 17:08:06 +04:00
Vadim Pisarevsky
58fb8692c3 added test for png encoding bug #2352 2012-09-17 16:44:40 +04:00
Ilya Lavrenov
03daf44848 added recalculating scale coefficients 2012-09-17 16:31:30 +04:00
Vadim Pisarevsky
d9e801fbfa improved image rendering performance in Qt backend for highgui UI (bug #2356) 2012-09-17 16:13:53 +04:00
Vadim Pisarevsky
37f4ea6be7 Merge remote-tracking branch 'origin/master' 2012-09-17 16:12:36 +04:00
Vadim Pisarevsky
7946fcdb69 added test for #2336 2012-09-17 16:12:30 +04:00
Andrey Kamaev
e73089bdb5 Fix windows build warnings 2012-09-17 13:30:28 +04:00
Andrey Kamaev
089de14ed7 Fix copy-paste bug in AVX optimization of haar 2012-09-17 13:30:28 +04:00
Andrey Kamaev
f32eb05ea1 Fix AVX and other SIMD support detection 2012-09-17 13:30:28 +04:00
Andrey Kamaev
cd05d9aaad Fix build of Java API for Windows 2012-09-17 13:21:20 +04:00
Andrey Kamaev
fe0d07ae53 Add experimental support for desktop Java
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
2012-09-17 13:21:20 +04:00
yao
78e89890b0 add PyrLK to ocl module 2012-09-17 09:48:34 +08:00
Andrey Kamaev
0e9405e591 Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation 2012-09-14 22:26:32 +04:00
Alexander Smorkalov
8104164c78 All HTC One S related changes reverted due to applyProperties problems on other devices. Libraries rebuilt. 2012-09-14 16:51:38 +04:00
yao
9efd7019ad A more reasonable verify method for ocl::HOG accuracy test 2012-09-14 17:07:29 +08:00
Vladislav Vinogradov
538847e8a3 fixed compilation under VS2012 (Bug #2352, #2355) 2012-09-14 09:34:56 +04:00
Andrey Kamaev
4772c42c66 Tweak strip flags for Android camera wrapper libs 2012-09-13 20:28:25 +04:00
Vladislav Vinogradov
35b671efb5 disabled utility code in gpu tests when WITH_CUDA=false 2012-09-13 12:17:35 +04:00
Vladislav Vinogradov
fd77ef7ece optimized gpu pyrDown and sepFilter2D 2012-09-13 10:21:43 +04:00
Vladislav Vinogradov
7591ee1688 fixed gpu perf tests (VideoCapture reopen) 2012-09-13 10:18:42 +04:00
Alexander Smorkalov
afe30d0f8a Native camera fix for Nexus 7 with Android JB. Camera build script updated. 2012-09-12 14:29:00 +04:00
yao
656f06fa74 add bruteForceMatcher to ocl module 2012-09-12 11:40:13 +08:00
niko
23244a3565 rename all the perf test files
fix the channel 3 bug in matrix operation
perf and buf fix for LUT haardetect convertC3C4 resize warpaffine copytom settom
add convovle
remove stereo
2012-09-12 10:31:09 +08:00
Vadim Pisarevsky
e94cd1ec72 updated description of LineIterator with information about LineIterator::pos() (ticket #2338) 2012-09-11 20:20:05 +04:00
Vadim Pisarevsky
52ede9c84d fixed just introduced bug in Python wrapper generator 2012-09-11 20:04:18 +04:00
Vadim Pisarevsky
84087a8566 fixed crash in Python's SURF wrapper (bug #2325) 2012-09-11 16:47:25 +04:00
Vladislav Vinogradov
e975259c06 several fixes in gpu module
fixed iterations>1 case in morphological operations
fixed possible access violation in HSV2RGB
fixed the case learningRate==0 in BackgroundSubtractorMOG2
2012-09-11 15:00:59 +04:00
Vadim Pisarevsky
9956c42804 fixed iterations>1 case in morphological operations (bug #2348; thanks to Andrei Zaharescu for the fix) 2012-09-11 14:49:56 +04:00
Vadim Pisarevsky
9ea5b6bb44 fixed possible access violation in HSV2RGB (patch #2020) 2012-09-11 14:25:34 +04:00
Vadim Pisarevsky
bbeffcc115 fixed the case learningRate==0 in BackgroundSubtractorMOG2 (patch #2221; thanks to Will Lucas) 2012-09-11 14:13:37 +04:00
Vadim Pisarevsky
bb93651048 added support for bi-level PNG's (patch #2301; thanks to Costantino Grana) 2012-09-11 14:05:25 +04:00
Vadim Pisarevsky
b3408a9b3a fixed bug #2186 (thanks to Joao Soares for the patch) 2012-09-11 13:56:25 +04:00
Ilya Lavrenov
fbd9bfba47 fixed some warnings and errors on windows 2012-09-10 21:37:44 +04:00
Andrey Kamaev
b1b5e392e6 Fix Android build warnings in new imgproc tests 2012-09-10 20:33:35 +04:00
Ilya Lavrenov
dd1091bbe1 a reference function for remap was stabilized 2012-09-10 19:55:03 +04:00
Andrey Kamaev
a201233b59 Fix warning in Android camera code 2012-09-10 19:44:59 +04:00
Alexander Smorkalov
7d4432df27 getWidth/getHeight optimized. 2012-09-10 17:08:35 +04:00
Vladislav Vinogradov
98c92f196e added Generalized Hough implementation 2012-09-10 16:49:40 +04:00
Alexander Smorkalov
86c7e183d2 Issue #2316 Change default libnative_camera path implemented. 2012-09-10 16:29:37 +04:00
Andrey Kamaev
e564a53ccd Add gitignore for Android tests and samples 2012-09-10 15:48:57 +04:00
yao
7d83db7d4d fix ocl::columnsum bug 2012-09-10 14:52:28 +08:00
Philipp Wagner
42f7329c78 Merge branch 'master' of git://code.opencv.org/opencv 2012-09-07 22:44:15 +02:00
Philipp Wagner
cfa250eff5 The labels of a model are now cloned instead of using Mat::copyTo, because Mat::copyTo leads to a crash with the Python wrapper. I need to further investigate it. 2012-09-07 22:42:46 +02:00
Andrey Kamaev
f268af8ef0 Removed remaining SWIG marks from headers 2012-09-07 22:19:43 +04:00
Philipp Wagner
a5e37779fb Added a simple CMakeLists.txt to the facerec_samples, which are not included in the samples folder. Makes building these samples a lot easier. 2012-09-07 17:33:44 +02:00
Andrey Morozov
e2d9fc4dcc fixed compile error under linux 2012-09-07 18:01:06 +04:00
Vadim Pisarevsky
7c13dc6cb3 little fix in command line parser - catch unknown parameter types 2012-09-07 17:49:38 +04:00
Vadim Pisarevsky
0598f33a85 refactored command line parser, fixed the docs 2012-09-07 17:44:01 +04:00
Alexander Smorkalov
710e070990 Native camera issue on HTC One S fixed.
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
2012-09-07 17:22:47 +04:00
AoD314
54a202b3d5 add new version of CommandLineParser. add empty docs 2012-09-07 13:24:48 +04:00
Andrey Kamaev
70234433d3 Reduce verbosity of Java API generators 2012-09-06 18:54:38 +04:00
Andrey Kamaev
b8adc04545 Fix Android build warnings 2012-09-06 18:54:38 +04:00
Andrey Kamaev
2cc262bce4 Fix Android CMake toolchain compiler and linker flags 2012-09-06 18:54:38 +04:00
Vsevolod Glumov
037e3ee288 Fixed some minor formatting issues in 'old_basic_structures' and 'operations_on_arrays'. 2012-09-06 10:57:28 +04:00
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