mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-05 01:39:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,733 Commits 6 Branches 126 Tags 3 GiB
55698548dd
Commit Graph

5160 Commits

Author SHA1 Message Date
Andrey Kamaev
e3474878b6 Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00
Andrey Kamaev
90ff4e6fc8 Convert test image to losless format 
This fixes java tests failing with new jpeg versions
 2013-01-17 20:43:57 +04:00
Andrey Kamaev
dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +04:00
Siegfried Hochdorfer
82a9f9a5a9 MeanshiftGrouping Bugfix (Bug #2685) 2013-01-17 11:46:24 +01:00
Vadim Pisarevsky
e3941d0965 refactored approxpoly 2013-01-17 00:11:08 +04:00
Andrey Pavlenko
a8c0f1d962 fixing test failure on some systems 2013-01-16 18:33:35 +04:00
Andrey Kamaev
ae5661d5dc Fix random failures of Split and Merge tests 2013-01-16 17:55:27 +04:00
Andrey Kamaev
867ddebe07 Merge pull request #289 from jmbuena:master 2013-01-16 17:01:00 +04:00
Andrey Kamaev
7341eaa654 Merge pull request #296 from asmorkalov:html_docs_warning_fix 2013-01-16 16:44:13 +04:00
Suenghoon Park
06da75ffe0 Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough 2013-01-15 12:21:25 -05:00
Andrey Kamaev
bf3c2b0bbb Fix incorrect Mat address reconstruction on 64-bit platforms 
This fixes random failures in Java wrappers.
 2013-01-15 19:23:49 +04:00
Anna Kogan
0587bef667 Switched time from seconds to minutes 2013-01-15 15:32:22 +04:00
Anna Kogan
3cdfa654ae Added 'Num of tests' col, changed headers, added 'overall time' row 2013-01-15 15:26:43 +04:00
Andrey Pavlenko
9f0d5f60b5 fixinf warning on non-Windows systems 2013-01-14 18:15:51 +04:00
Alexander Smorkalov
8cb0343f4c Documentation build warning fixes. 
Invalid links and refences fixed.
SpaeseMat class documentation updated.
 2013-01-14 17:58:27 +04:00
Andrey Pavlenko
8e42ca1764 SURF keypoints rotation invariance test. 
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
 2013-01-14 14:06:00 +04:00
Andrey Kamaev
c49b23d4dd Merge pull request #240 from emchristiansen:javatest2.4 2013-01-14 11:06:44 +04:00
jmbuena
28a7be69ea Fixed compile warnings on CvHomographyEstimator 2013-01-12 12:32:51 +01:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Andrey Pavlenko
b0e1cb473a more tests fixes 2013-01-11 09:13:25 +04:00
jmbuena
6d738f6a3f Changed RANSAC Homography estimation for speed. Each minimal set is checked for consistency before actually fit a candidate homography. 2013-01-11 01:55:56 +01:00
Vadim Pisarevsky
19229f2fa0 Merge pull request #253 from Nerei:smart_operators_for_smart_ptr 2013-01-10 20:35:22 +04:00
Andrey Kamaev
a99799caa3 Merge pull request #286 from taka-no-me:tweak_phase_test_threshold 2013-01-10 19:57:23 +04:00
Andrey Kamaev
b1384a6da8 Fix cvCalcOpticalFlow when the status parameter is NULL 
issue 2526
 2013-01-10 18:14:08 +04:00
Andrey Kamaev
20c5a8788d Weaken acceptance criteria in phase test 2013-01-10 17:12:14 +04:00
Andrey Kamaev
dff59ec960 Merge pull request #284 from taka-no-me:fix_equalize_hist_2678 2013-01-10 16:58:36 +04:00
Andrey Kamaev
59c6e2cc44 Merge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output 2013-01-10 16:58:22 +04:00
Vadim Pisarevsky
b68df415a9 Merge pull request #135 from nevion:master 2013-01-10 16:43:45 +04:00
Andrey Kamaev
6131a847a2 Fix histogram calculation in equalizeHist 
issue #2678
 2013-01-10 14:48:31 +04:00
Andrey Kamaev
b81d1b25c7 Merge pull request #280 from vpisarev:bug_fixes_jan9 2013-01-10 13:31:04 +04:00
Anna Kogan
3271e395c8 Improved console output 2013-01-10 13:19:59 +04:00
Anna Kogan
0d7ce141aa Cleaned code 2013-01-10 13:18:26 +04:00
Anna Kogan
0334cf11cc Fixed last testsuit disregarding 2013-01-10 13:16:46 +04:00
Vadim Pisarevsky
e383d39598 fixed bug #2679 2013-01-09 17:53:19 +04:00
Andrey Kamaev
399c20a928 Merge pull request #272 from 5kg:fix_haar 2013-01-09 16:53:11 +04:00
Andrey Kamaev
e34aba60d9 Merge pull request #278 from taka-no-me:fix_build_jpeg9 2013-01-09 16:52:56 +04:00
Andrey Kamaev
873aefae19 Merge pull request #279 from taka-no-me:mingw_java 2013-01-09 16:52:41 +04:00
Vadim Pisarevsky
46cf2e96b5 Merge pull request #265 from taka-no-me:doc_signatures 2013-01-09 15:40:39 +04:00
Andrey Kamaev
4e1ba6f02f Fix build with libjpeg release 9 2013-01-08 19:55:29 +04:00
Anatoly Baksheev
a09b973c2e Smart operators for smart Ptr (feature #2637) 2013-01-07 22:33:12 +04:00
Suenghoon Park
269ccaa431 Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough 2013-01-02 14:59:59 -05:00
Ilya Lavrenov
1bc76813f3 fixed bug connected with SSE2 version of resize with AREA interpolation 2012-12-31 15:35:40 +04:00
Andrey Kamaev
da9089612a Fix build of java bindings on mingw 2012-12-30 23:24:39 +04:00
marina.kolpakova
e53d57664d fix precompiled headers usage in gpu module 2012-12-30 16:58:41 +04:00
cuda-geek
47df8f4c2a Merge pull request #275 from mdim:bug_fix_cvboost 2012-12-30 00:31:03 +04:00
Vladislav Vinogradov
bb07e2710e decreased source size in NCV.VectorOperations test 2012-12-29 20:07:29 +04:00
marina.kolpakova
45191dd6a5 merge CUDA dev branch 2012-12-29 19:44:38 +04:00
Suenghoon Park
4f965296fc modified performance test for ocl::HoughCircles 2012-12-28 16:32:10 -05:00
Maria Dimashova
0e2958e888 fixed CvBoost::predict 
(Sometimes sample_data became bad because the buffer with its values was deallocated early).
 2012-12-29 00:30:52 +04:00
Suenghoon Park
0afa9cede5 removed personal info from the license header 2012-12-28 10:08:28 -05:00
Zifei Tong
260bdc057c Changed parallel_for to parallel_for_ in haar.cpp 2012-12-28 22:56:47 +08:00
Andrey Pavlenko
c49b1bc6d5 partial fix for failing tests; fix for Windows launcher script; more quiet output 2012-12-28 17:03:35 +04:00
Zifei Tong
e331787645 Fix race condition for Cascade Classifier when TBB enabled. 2012-12-28 20:51:02 +08:00
Andrey Kamaev
3759476b38 Merge pull request #266 from prclibo:master 2012-12-28 12:51:34 +04:00
Suenghoon Park
2124de80a5 Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough 2012-12-26 17:40:38 -05:00
Suenghoon Park
8a1d6a1bb2 added documentation for ocl::HoughCircles 2012-12-26 17:40:26 -05:00
Suenghoon Park
b1faa46d3a added performance test 2012-12-26 16:49:58 -05:00
Bo Li
956a029ede added code, test and doc for five-point algorithm 2012-12-26 18:58:50 +01:00
Andrey Kamaev
b401c6a0c3 Fix discrepancies between function signatures in headers and documentation 2012-12-26 18:24:50 +04:00
Andrey Kamaev
aabbe11e64 Improve function arguments parsing and checking 
* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors
 2012-12-26 17:55:03 +04:00
Kirill Kornyakov
5023afffc7 Removed hack from perf test on HoughLines, since I hope it is fixed by pr263 2012-12-26 10:33:02 +04:00
Anatoly Baksheev
389ecbe96d warnings, renamed Marina's GPU_PERF_TEST_P 2012-12-25 22:00:20 +04:00
Anatoly Baksheev
be22891f71 added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app) 2012-12-25 21:23:15 +04:00
Andrey Kamaev
132b5d6435 Merge release 2.4.3.2 2012-12-25 19:07:08 +04:00
Andrey Kamaev
16687a2655 Explicitly use double precision sin & cos in hough implementation 
On some platforms sin and cos are calculated in single precision resulting in
diversity of results.
 2012-12-25 18:05:05 +04:00
Suenghoon Park
78202100df added unit test for HoughCircles 2012-12-24 22:53:27 -05:00
Suenghoon Park
ecb6c20915 Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough 2012-12-24 18:42:22 -05:00
Suenghoon Park
e1c6564d5e fixed a typo in ocl.hpp 2012-12-24 18:41:51 -05:00
Andrey Kamaev
02d1e68c64 Merge pull request #257 from AnnaKogan8:perf-tests-timing-script 2012-12-24 19:38:49 +04:00
Alexander Smorkalov
9ca65ceef8 OpenCV example-tutorial1 does not work on Android emulator (Bug #2656) 
Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).
 2012-12-24 17:49:49 +04:00
Andrey Kamaev
13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
Anna Kogan
f57d692cd7 Improved code 2012-12-24 17:09:04 +04:00
Anna Kogan
e1331b44f5 Wrote script generating timing table 2012-12-24 17:09:04 +04:00
Andrey Kamaev
014a500f79 Merge pull request #256 from znah:2.4 2012-12-24 16:11:19 +04:00
marina.kolpakova
2128bd25e4 fix warnings under win 2012-12-24 15:28:05 +04:00
marina.kolpakova
3882bbbf35 improve carma build 
- exclude system paths from library search paths
 - remove hardcoded paths to compiler
 - enable compiling with 3d-parties
 - enable build as shared libraries
 2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev
524bde2aeb Merge pull request #255 from taka-no-me:fix_batchdist_test 2012-12-24 13:29:32 +04:00
Alexander Mordvintsev
20838b6f6e fix #2643: use SVD to solve least squares in cvStereoRectifyUncalibrated 2012-12-24 12:59:39 +04:00
Andrey Kamaev
02c7e221a3 Merge pull request #252 from taka-no-me:fix_stlport_build 2012-12-24 12:44:13 +04:00
Vladislav Vinogradov
4db68b50f2 fixed Sobel and Scharr tests 
compare inner part
 2012-12-23 14:21:16 +04:00
Andrey Kamaev
c02179a765 Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3" 
This reverts commit 4be7619ce4.
 2012-12-22 21:14:14 +04:00
Andrey Kamaev
b870b246e1 Fix memory corruption in batchDistance perf tests 2012-12-22 21:01:57 +04:00
Andrey Kamaev
f87987ed72 Honor multidimensional matrices in InputArray::total 2012-12-22 17:56:02 +04:00
Andrey Kamaev
9944282b09 Fix build with STLPort from NDK r8d 2012-12-22 00:59:56 +04:00
Andrey Kamaev
62af76c646 Merge pull request #249 from taka-no-me:tvl1_max_rmse 2012-12-21 23:05:44 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Andrey Kamaev
b6efec5f8b Add support for Android NDK r8d 2012-12-21 15:39:23 +04:00
Andrey Kamaev
c513d4ecd6 Increase max RMSE error for tvl1 optical flow test 2012-12-21 14:18:07 +04:00
Vladislav Vinogradov
2f1ca1b6b3 fixed build for CARMA: 
* added CMake toolchain file
* added WITH_NVCUVID flag
 2012-12-21 13:45:50 +04:00
vlad
11293d071f Revert "disabled video decoding under linux" 
This reverts commit 889674ef43.
 2012-12-21 12:54:38 +04:00
Andrey Kamaev
9526907cba Use .yml.gz format to reduce space requirement from ~260Mb to ~17Mb for ml tests 
The size of temporary files is an issue on mobile platforms.
 2012-12-20 18:46:54 +04:00
Andrey Kamaev
aaf779a3a2 Adjust OpenCV version to 2.4.3.2 2012-12-20 17:19:34 +04:00
Vladislav Vinogradov
660d23aa04 added cv::gpu::resetDevice to RunPerfTestBody 2012-12-20 15:33:04 +04:00
Vladislav Vinogradov
1a76242d99 added GPU_TEST_P macros 2012-12-20 15:33:04 +04:00
takacsd
64f821908e Add missing _WIN32 check in core/operations.hpp. 
Fix a compilation error with MinGW gcc 4.7 with enabled C++11 support (-std=c++11).
Issue number: #2555
 2012-12-20 11:28:16 +01:00
Andrey Kamaev
ca7abe1239 Reduce number of performance tests for LBP cascade 2012-12-20 12:25:59 +04:00
Jason Newton
4cb25e9584 update documentation to latest connected components interface 2012-12-19 14:55:46 -08:00
Eric Christiansen
ad326cb0be adds desktop java junit tests 2012-12-19 14:28:59 -08:00
Andrey Kamaev
35ac95930f Merge pull request #236 from asmorkalov:javadoc_fix 2012-12-19 16:32:45 +04:00
Andrey Kamaev
b35fa6c4ff Merge pull request #202 from Daniil-Osokin:calcHist 2012-12-19 15:07:40 +04:00
Alexander Smorkalov
d7c89fc649 A lot of javadoc warnings duting javadoc build (Bug #2647) issue fixed 
Black list of entities, that are not implemented in Java API added to javadoc generator
 2012-12-19 12:53:44 +04:00
Vladislav Vinogradov
4ba33fa1ed Revert "call resetDevice if gpu test fails" 
This reverts commit ab25fe9e37.
 2012-12-19 11:13:31 +04:00
Vadim Pisarevsky
a75e5ac277 Merge pull request #232 from asmorkalov:compiler_bug_workaround 2012-12-19 10:20:10 +04:00
Andrey Kamaev
2c56a09bee Merge pull request #226 from taka-no-me/equalizeHist 
Fix equalization formula in equalizeHist function & rewrite in C++
 2012-12-18 15:53:13 -08:00
Vadim Pisarevsky
31857082f4 probably fixed build problems on Android 2012-12-18 14:12:07 -08:00
Daniil Osokin
98d7d99244 Add threaded version of equalizeHist 2012-12-18 23:59:50 +04:00
Vladislav Vinogradov
41c9377db0 fixed warnings under windows 2012-12-18 18:03:54 +04:00
Vladislav Vinogradov
ab25fe9e37 call resetDevice if gpu test fails 2012-12-18 16:59:00 +04:00
Alexander Smorkalov
dfa4b2fefa Workaround for gcc overoptimization compiler bug. 2012-12-18 15:58:17 +04:00
Vladislav Vinogradov
0973e86d8a fixed printShortCudaDeviceInfo for new CC 2012-12-18 13:56:21 +04:00
Vladislav Vinogradov
bac94f85c1 fixed printCudaDeviceInfo for 3.5 CC (Patch #2641) 2012-12-18 13:50:19 +04:00
Vladislav Vinogradov
dd8e442bda replaced DeviceInfo().supports with deviceSupports 2012-12-17 17:03:39 +04:00
Ilya Lavrenov
a319bae6e2 added #undef _mm_packus_epi32 2012-12-17 16:56:37 +04:00
Ilya Lavrenov
d246b41573 changed loop condition 2012-12-17 15:50:01 +04:00
Ilya Lavrenov
c2f2e33a5e removed debug messages 2012-12-17 15:45:20 +04:00
Ilya Lavrenov
743dce6a4b Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2 2012-12-17 15:27:32 +04:00
Ilya Lavrenov
aa0dafcc1f replaced _mm_packs_epi32 to _mm_packus_epi32 2012-12-17 14:09:25 +04:00
Daniil-Osokin
cd501d947c perf tests for calcHist 2-3D case 2012-12-17 12:35:32 +04:00
Daniil-Osokin
7d94236c14 TBB version of calcHist 2012-12-17 11:01:31 +04:00
Jason Newton
e1b60aa4e3 drop usage of macros... the type is already there! 2012-12-16 22:44:36 -08:00
Vladislav Vinogradov
da017fbeb9 fast optical flow bm implementation 2012-12-17 10:39:19 +04:00
Jason Newton
5f86eb8d63 proper dimensions from cv::Size in output stats/centroid 2012-12-16 18:33:50 -08:00
Vadim Pisarevsky
09be997ed8 Merge pull request #225 from pieleric:2.4 2012-12-16 22:18:24 +04:00
Vadim Pisarevsky
2508d8e2b4 Merge pull request #218 from taka-no-me:drop_utf16 2012-12-16 22:16:54 +04:00
Vadim Pisarevsky
1eae455acb fixed build warnings from VS; hopefully, fixes Android build too 2012-12-15 23:14:50 +04:00
Anatoly Baksheev
94c310fc14 added Ptr::operator== 2012-12-15 22:48:50 +04:00
Vadim Pisarevsky
2a42960ff2 Merge branch 'master' of https://github.com/nevion/opencv into cc 2012-12-15 21:45:55 +04:00
Andrey Kamaev
80a1d569ca Add support for multidimentional matrices into the sanity checks 2012-12-15 20:15:34 +04:00
Jason Newton
ad0bfdfb25 disable windows build warning for connectedcomponents template argument comparisons 2012-12-15 05:56:18 -08:00
Jason Newton
68e77ac051 use opencv's integer type convension 2012-12-15 04:25:55 -08:00
Andrey Kamaev
3de6846d12 Merge pull request #224 from wswld:2.4 2012-12-15 16:06:32 +04:00
Andrey Kamaev
0bbba847a4 Fix equalization formula in equalizeHist function & rewrite in C++ 
Old implementation did

    lut[i] = 255 * (count(Y <= i)) / (width * height)

which actually shifts uniform histograms.
From now histogram is equalized as

    C = count(Y == min(Y))
    lut[i] = 255 * (count(Y <= i) - C) / (width * height - C)
 2012-12-15 15:29:15 +04:00
Éric Piel
7701fa7a63 highgui: fix segfault on CvCapture_GStreamer::open 
when compiled with GStreamer, open (of a file) segfaults.

Fix was suggested by Bostjan Vesnicer.
 2012-12-15 12:11:13 +01:00
cuda-geek
aabb40e34d Merge pull request #217 from jet47:fix-tvl1-test 2012-12-15 00:45:12 +04:00
Andrey Kamaev
fe0b88d291 Set sanity threshold for TVL1 optical flow to 0.5 2012-12-14 18:35:23 +04:00
Ilya Lavrenov
6059a6875a fixed bug with s1 calculating 2012-12-14 17:54:07 +04:00
Ilya Lavrenov
4ccb5a30d9 fixed bug with s1 calculating 2012-12-14 17:41:42 +04:00
Andrey Kamaev
1284121d89 Set sanity threshold for TVL1 optical flow to 0.02 2012-12-14 17:40:51 +04:00
Andrey Kamaev
f5cd20d80b Merge branch 2.4 2012-12-14 14:46:41 +04:00
Ilya Lavrenov
16f9b6f5e4 reproducing C++ version of resize area fast 2012-12-14 14:32:00 +04:00
Suenghoon Park
13c44dd318 finished ocl::HoughCircles 2012-12-14 03:25:46 -05:00
Vsevolod Glumov
3f417f1ec3 Fixes for issues #2570, #2492, #2559, #2489, #2592. 2012-12-14 10:49:51 +04:00
Vladislav Vinogradov
caf91ac159 new gpu::HoughLinesP implementation 2012-12-13 17:18:25 +04:00
Vladislav Vinogradov
8c057af862 fixed windows build 2012-12-13 15:40:05 +04:00
Vladislav Vinogradov
da93a1dab9 fixed build for CARMA platform 2012-12-13 13:49:32 +04:00
Vladislav Vinogradov
889674ef43 disabled video decoding under linux 2012-12-13 13:48:24 +04:00
Suenghoon Park
0656f13107 removed useless comments in buildPointList_gpu() 2012-12-13 02:43:13 -05:00
Suenghoon Park
3a04cfedab added HoughCircles in ocl.hpp 2012-12-13 02:35:31 -05:00
Suenghoon Park
ad86b80375 finished buildPointList 2012-12-13 02:33:21 -05:00
Andrey Kamaev
5a407153bd Fix sanity checks in stitching test 2012-12-12 20:29:23 +04:00
Andrey Kamaev
817a4c0c30 Merge branch 2.4 into perf_verify_sanity 2012-12-12 20:14:25 +04:00
Andrey Kamaev
932204d197 Added thresholds to some sanity checks 2012-12-12 20:14:20 +04:00
Andrey Kamaev
e1afb1409f Add --perf_verify_sanity option to performance tests 
This option provides an easy way to identify tests having no regression data
for sanity checks
 2012-12-12 19:42:24 +04:00
cuda-geek
464826c232 Merge pull request #181 from cuda-geek:nms 2012-12-12 15:39:20 +04:00
Vadim Pisarevsky
eaeae4a1ba Merge pull request #184 from ilya-lavrenov:Demosaicing 2012-12-12 13:54:58 +04:00
marina.kolpakova
5ddf4e4ed7 change expected values for soft cascade test according to changes in implementation 2012-12-12 09:37:21 +04:00
marina.kolpakova
2d45af790e fix according to pull requests comments 2012-12-12 05:07:39 +04:00
marina.kolpakova
88c71d1b7d add NMS according to Dollar's paper. 2012-12-12 04:31:44 +04:00
marina.kolpakova
9785a8ae34 fix docs for SCascade 2012-12-12 04:22:01 +04:00
marina.kolpakova
c470e15d45 integrate speprocessing strategy 2012-12-12 03:43:20 +04:00
Andrey Kamaev
6e244c83cd Corrected sanity checks in several perf tests 
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
 2012-12-12 01:00:47 +04:00
marina.kolpakova
d23a4f50bd add resize 2012-12-12 00:39:40 +04:00
marina.kolpakova
8ef19e7664 hack luv 2012-12-12 00:39:40 +04:00
marina.kolpakova
0e1005ca92 optimize hog bin computing 2012-12-12 00:39:40 +04:00
marina.kolpakova
ee291a15da add preprocessing only function 2012-12-12 00:39:40 +04:00
Ilya Lavrenov
d1ca934115 sse2 version of resize area fast for types CV_(8, 16)UC(1, 3, 4) 2012-12-11 15:14:50 +04:00
Vladislav Vinogradov
87e0eee92b fixed remap and warp gpu tests 2012-12-11 14:38:08 +04:00
Vladislav Vinogradov
746bc168e6 fixed gpu warpAffine and warpPerspective with NPP 2012-12-11 11:05:06 +04:00
marina.kolpakova
a6c3ed5b36 Merge branch master into cuda-dev 2012-12-11 01:12:14 +04:00
Andrey Kamaev
67ce03d7dd Merge branch 2.4 2012-12-10 23:51:34 +04:00
Andrey Kamaev
60ad505a63 Merge pull request #212 from taka-no-me/fix_2602 
Prevent imread from illegal memory access (Bug #2602)
 2012-12-10 11:48:28 -08:00
Andrey Kamaev
f7dc98f67b Merge pull request #205 from taka-no-me/gtest_r629 
Update googletest to the latest upstream
 2012-12-10 08:07:30 -08:00
Kirill Kornyakov
cdbbfc98e1 Ugly hack to make HoughLines sanity check pass on Wun32 2012-12-10 18:16:15 +04:00
Anatoly Baksheev
50946b59c1 minor device namespace refactor 2012-12-10 17:36:02 +04:00
Jason Newton
63debf5032 connectedcomponents test case 2012-12-10 02:21:45 -08:00
Ilya Lavrenov
615e7b2747 added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U 2012-12-10 13:29:08 +04:00
Vladislav Vinogradov
53f1e73535 fixed Video_calcOpticalFlowDual_TVL1 test (Bug #2597) 
uses RMSE instead of bitwise equivalence
 2012-12-10 13:03:47 +04:00
Vladislav Vinogradov
5fe9bb717d fixed build under linux with OpenGL 2012-12-10 11:05:51 +04:00
Jason Newton
d094e4bdbe drop support for 8bit output for size cost relative to utility 2012-12-08 23:09:17 -08:00
Jason Newton
e70b3ef598 use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays 2012-12-08 23:09:14 -08:00
Andrey Kamaev
18e77d606c Drop functions working with multibyte characters 2012-12-08 18:18:11 +04:00
Andrey Kamaev
7c6191ec11 Refactored run.py script and temporary file generation logic 
* use OPENCV_TEMP_PATH environment variable on all platforms
* fix cleanup after OpenCV tests on Windows
* add --list flag to output names of all tests found
* do not override user-passed --perf_min_samples and --perf_force_samples
  options by --check flag
* fix complier checks inside run.py
 2012-12-08 15:43:23 +04:00
marina.kolpakova
79c3a8e03b fix build under win. 2012-12-07 16:56:54 +04:00
Vladislav Vinogradov
4102aaaf15 fixed compilation of color.cu under windows x86 
it was some bug in nvcc (it fails on this file)
 2012-12-07 14:16:18 +04:00
Vladislav Vinogradov
c6263eb253 fixed build with CUDA and witout OpenGL 2012-12-07 14:03:23 +04:00
Eugene Gritskevich
8ca86e2f52 Update modules/ml/doc/gradient_boosted_trees.rst 2012-12-06 21:44:55 +03:00
Andrey Kamaev
1821d21f5b Prevent imread from illegal memory access (Bug #2602) 
The change is based on pull request #211.
 2012-12-06 19:42:17 +04:00
Vladislav Vinogradov
0d880479f0 updated nv perf test script (added opticalFlowBM and HoughLinesP) 2012-12-06 16:00:47 +04:00
Vladislav Vinogradov
aad76090ce gpu::HoughLinesP 2012-12-06 15:14:20 +04:00
Vladislav Vinogradov
a6dc6f72b3 gpu::calcOpticalFlowBM 2012-12-06 15:11:13 +04:00
Vladislav Vinogradov
afa5809473 added additional performance tests 2012-12-05 17:21:08 +04:00
Vladislav Vinogradov
e17710c478 removed type check in gpu::FarnebackOpticalFlow 
now it supports all depths
 2012-12-05 14:20:48 +04:00
Vladislav Vinogradov
0930ac497f removed type check in gpu::PyrLKOpticalFlow 
not it support all depths
 2012-12-05 14:20:18 +04:00
Vladislav Vinogradov
d94f08f0e7 added more types support for gpu separable filters 2012-12-05 14:19:36 +04:00
Vladislav Vinogradov
b689eca8a0 fixed OpenGL tests 
now create window only once per test case
 2012-12-05 14:18:57 +04:00
Vladislav Vinogradov
aabc33c772 temporarily disabled reduceKeyVal implementation for kepler 
used fermi implementation
 2012-12-05 10:36:54 +04:00
Andrey Kamaev
b0d3830399 Update gtest to upstream r629 2012-12-05 03:02:37 +04:00
Vadim Pisarevsky
7852b68c20 Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix 2012-12-04 21:02:10 +04:00
Vladislav Vinogradov
e311613fc8 fixed warnings "double not supported" 2012-12-04 10:37:13 +04:00
Vladislav Vinogradov
7ab9c4ccee fixed compilation on 1.1 CC 2012-12-04 10:36:46 +04:00
Alexander Smorkalov
6e0db3f527 Feature #1322 "If dll cannot be loaded a warning should be generated" implemented. 2012-12-03 13:52:49 +04:00
Vladislav Vinogradov
06776b612c fixed warnings 2012-12-03 13:27:20 +04:00
Vladislav Vinogradov
05d842bcd8 a bit more opengl refactoring: 
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
 2012-12-03 13:11:06 +04:00
Ilya Lavrenov
07744ccf3d removed imshow call 2012-12-03 12:30:19 +04:00
Andrey Kamaev
ae5649d3f7 Drop unsupported imageio from grfmt 2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902 Revert incompletely applied patch from #2192 
This reverts commit 2e7656dbdf.
 2012-12-03 09:55:53 +04:00
Andrey Kamaev
476efd7d37 Drop unsupported yzx and mil camera backends 2012-12-03 09:28:01 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality 
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
 2012-11-30 17:35:28 +04:00
Andrey Kamaev
49c35fafc0 Adjust OpenCV version to 2.4.3.1 2012-11-30 14:33:28 +04:00
Ilya Lavrenov
c09a325d3e fixed error connected with incorrect range 2012-11-30 13:26:40 +04:00
Ilya Lavrenov
98031a4147 removed const modificators 2012-11-30 12:31:33 +04:00
Vladislav Vinogradov
2eebd8d939 fixed build under windows 2012-11-29 18:40:27 +04:00
Alexander Smorkalov
f6ff2b87fa Some perf tests on warping and resize disabled on Android 
MatInfo_Size_Size.resizeDownLinear
MatInfo_Size_Size.resizeUpLinear
TestWarpPerspectiveNear_t.WarpPerspectiveNear
TestWarpPerspective.WarpPerspective
 2012-11-29 18:21:22 +04:00
Andrey Kamaev
64bed2060a Merge pull request #194 from asmorkalov/v4l_fix 
Patch #2323 applied
 2012-11-29 01:27:34 -08:00
Andrey Kamaev
7e8fab0747 Merge pull request #195 from vpisarev/inv3x3_fix 
now invert 3x3 on "bad" matrices works well on Windows
 2012-11-29 01:27:27 -08:00
Vladislav Vinogradov
362655b02a fixed Bug #2581 
GoodFeaturesToTrackDetector_GPU fails when no corners found
 2012-11-29 11:19:30 +04:00
Vadim Pisarevsky
b57e801c04 now invert 3x3 on "bad" matrices works well on Windows 2012-11-28 23:05:51 +04:00
Alexander Smorkalov
bb3d14e1a0 Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied. 2012-11-28 21:53:39 +04:00
Anna Kogan
4e21f42714 increased time-limits 2012-11-28 18:17:33 +04:00
Anna Kogan
8877066846 increased time-limits 2012-11-28 18:17:33 +04:00
Andrey Kamaev
157cdeb443 Merge pull request #175 from taka-no-me:run_py 2012-11-28 12:44:05 +04:00
Andrey Kamaev
50bebd6f0b Merge pull request #166 from askforeric:pvapi_updates 2012-11-28 11:31:01 +04:00
askforeric
3923484341 Refactored the PvAPI capture class to better facilitate dynamic property changes 
- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
  but does not fail if this doesn't succeed.
 2012-11-28 11:28:16 +04:00
marina.kolpakova
2e0161c6c5 create objects mat if empty 2012-11-28 10:50:33 +04:00
marina.kolpakova
d985861462 remove unused std imports 2012-11-28 03:51:37 +04:00
marina.kolpakova
1d97a4549d fixed compilation for GCC 4.6 2012-11-28 03:51:37 +04:00
Vladislav Vinogradov
0b2c1dc871 fixed build without CUDA 2012-11-27 18:43:17 +04:00
Vladislav Vinogradov
d2591704e8 Merge branch 'kepler-optimization' into cuda-dev 2012-11-27 16:34:45 +04:00
Ilya Lavrenov
b8b13ccd5c parallel version of Bayer2Gray 2012-11-27 15:27:58 +04:00
Alexander Smorkalov
2e5a7284d2 Code review comments applied. 2012-11-27 14:55:49 +04:00
Jason Newton
00bdca7684 A few changes to comply with upstream requirements for merge. 
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.

-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
 2012-11-27 02:31:38 -08:00
Ilya Lavrenov
ce5e9a71b5 fixed some warnings on Windows and added debug messages 2012-11-27 13:54:11 +04:00
Alexander Smorkalov
0efc32fc21 Attribure loading from layout improved. 
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
 2012-11-27 12:47:41 +04:00
Alexander Smorkalov
8266eab8b4 OpenCV app framework improved 
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
 2012-11-27 12:47:41 +04:00
Ilya Lavrenov
4116cbe2c0 Merge remote-tracking branch 'upstream/master' into Demosaicing 2012-11-27 12:46:49 +04:00
Vladislav Vinogradov
2eca75ccdd added common TransformFunctorTraits for element operations 2012-11-27 11:08:53 +04:00
marina.kolpakova
22b0ea1cf0 sort for Hough sanity checks 2012-11-26 23:54:10 +04:00
marina.kolpakova
554a7cb33a add epsilon in sanity checks 2012-11-26 23:52:56 +04:00
Andrey Kamaev
214629b220 Merge pull request #187 from vpisarev:doc_fixes_2.4 2012-11-26 22:33:01 +04:00
Andrey Kamaev
dc3aa27be4 Merge pull request #183 from apavlenko:perf/android_filters_accuracy 2012-11-26 22:32:38 +04:00
Andrey Pavlenko
c36dcbcada Increase accuracy interval for image filters on Android and other platforms when sensible 2012-11-26 22:29:05 +04:00
Ilya Lavrenov
3fa630639f fixed bayer2bgra in case when size.width <= 2 2012-11-26 19:45:56 +04:00
marina.kolpakova
209f16455d Merge cuda-geek/soft-cascade-gpu into cuda-dev 2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c Merge origin/master into cuda-dev 2012-11-26 18:56:33 +04:00
marina.kolpakova
05cd88ae42 clean code; fix problems in documentation 2012-11-26 18:50:08 +04:00
Vadim Pisarevsky
db965353f4 fixed a few compile errors/warnings in 2.4 branch of the docs 2012-11-26 18:48:23 +04:00
marina.kolpakova
39da17a02a Merge pull requst #177 from cuda-geek/another-one-integral-fix 2012-11-26 18:10:21 +04:00
marina.kolpakova
a22edb037f fixed typo 2012-11-26 17:57:56 +04:00
marina.kolpakova
bd3179bda8 fix CUDA support for streams for NMS; refactor tests 2012-11-26 17:53:25 +04:00
marina.kolpakova
60c0e41ba5 integrate NMS (Dollar's criteria) 2012-11-26 17:22:47 +04:00
Ilya Lavrenov
5225672dc0 added edge-aware demosaicing and bayer to bgra conversion 2012-11-26 16:17:43 +04:00
Vladislav Vinogradov
f022b12c57 saturate_cast via asm cvt command 2012-11-26 15:36:15 +04:00
marina.kolpakova
d2e88e1d4d nms: part 1 2012-11-26 15:26:11 +04:00
Vladislav Vinogradov
63a022dcd7 added explicit unroll to reduce implementation 2012-11-26 13:12:50 +04:00
Vladislav Vinogradov
11c6eb6305 element operations 2012-11-26 11:45:25 +04:00
Vladislav Vinogradov
f00efcfc59 added optimized deviceSupports function 2012-11-26 11:41:52 +04:00
Vladislav Vinogradov
a71ef7d67b convertTo 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
572d2d6a84 warpScanInclusive 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
76e8794e81 fixed warnings on old compute capabilities 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e6b1ccdcdf removed old reduce implementation 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e8f9762ef3 matrix reduction 2012-11-26 11:37:50 +04:00
Vladislav Vinogradov
fbf3de43a2 SURF 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
19c87d1c9d ORB 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
7f97fb481c FastNonLocalMeans 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1f1e24be3c PyrLKOpticalFlow 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1b571bde10 StereoConstantSpaceBP 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0e339dd137 hog 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0ddd16cf78 calcHist & equalizeHist 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7e57648ea2 FGDStatModel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
28716d7f30 Canny 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
e299595667 computeHypothesisScoresKernel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
05db02fbc8 BruteForceMatcher 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7a1874b2cc new reduce and reduceKeyVal implementation 2012-11-26 11:37:36 +04:00
Vladislav Vinogradov
d47c112434 fix abs_func and minimum/maximum functors 2012-11-26 11:37:36 +04:00
marina.kolpakova
7df45c0dcc remove unnecessary copying in SURF 2012-11-25 03:26:50 +04:00
marina.kolpakova
91913364d6 reintegrate warp shuffle based integral 2012-11-25 03:21:51 +04:00
marina.kolpakova
5460cee9e9 fix cascade classifier GFF NMS for empty candidates vector 2012-11-25 03:19:24 +04:00
Andrey Kamaev
23011ffd81 Merge pull request #179 from cuda-geek:usr-bin-env-python 2012-11-24 19:24:01 +04:00
Maria Dimashova
97e36b9375 fix a compile error in case of building without highgui 2012-11-24 18:10:29 +04:00
marina.kolpakova
68d04d28b6 replace offsets in surf to simple copy for better speed 2012-11-24 16:50:29 +04:00
Andrey Kamaev
8daebeac8a run.py: add --check option for easy run of sanity checks 2012-11-24 14:12:32 +04:00
Andrey Kamaev
9db1d9ba13 run.py: improve handling of multiple Android devices 
* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
 2012-11-24 14:11:07 +04:00
marina.kolpakova
be0c20b758 align grid by 4 2012-11-24 01:55:03 +04:00
marina.kolpakova
285d6320be add #/usr/bin/env python to all python files 2012-11-23 22:57:22 +04:00
Jason Newton
d5aa679d3f adjust output type to return int32... it should at least be unsigned but this breaks python bindings; 
remove non-8bit input type support, not worth the binary size
 2012-11-22 21:26:52 -08:00
marina.kolpakova
6ccd7aca4c fix tests for arm 2012-11-22 13:26:13 +04:00
Alexander Smorkalov
3282e08f55 Default native library path for native camera updated. 
New versions tries to search library in arm-v7a and Manager packages only.
 2012-11-22 12:40:25 +04:00
Andrey Kamaev
24af691843 Merge pull request #168 from asmorkalov:android_42_camera_fix 2012-11-21 14:50:53 +04:00
Vadim Pisarevsky
c31f106012 Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4 2012-11-21 11:43:18 +04:00
Alexander Smorkalov
aa4e6a8a83 Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed; 
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
 2012-11-21 11:37:29 +04:00
Andrey Kamaev
7f542e391a Merge branch 2.4 
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
 2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5 Merge pull request #161 from apavlenko:fix/sdk_r21 2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e Improving compatibility with the latest Android SDK (r21) and NDK (r8c). 
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
 2012-11-20 18:40:22 +04:00
Andrey Kamaev
934b623fa9 Merging pull request #169 from taka-no-me:android-ndk-r8c 2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4 Fix Android build with clang compiler 2012-11-20 15:20:04 +04:00
Alexander Smorkalov
66a1ea7604 Test execution inside Eclipse fixed; 
OpenCV testing via OpenCV Manager implemented.
 2012-11-20 10:45:46 +04:00
Ilya Lavrenov
4abf0b3193 thread-safe VideoWriter and VideoCapture 2012-11-19 16:44:23 +04:00
marina.kolpakova
a9f10e5cad fixed compile without cuda 2012-11-14 20:34:17 +04:00
marina.kolpakova
0865227049 check if scaling values changed 2012-11-14 20:28:08 +04:00
marina.kolpakova
c3e4a52fbe soft cascade sample 2012-11-14 20:11:18 +04:00
Andrey Kamaev
2e2d927273 Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF 2012-11-14 17:30:06 +04:00
marina.kolpakova
ee4f003e72 fixed typo 2012-11-14 14:49:38 +04:00
marina.kolpakova
781c04324e refactor: PrefixSum 2012-11-14 14:47:00 +04:00
marina.kolpakova
a30bbda3bd remove hardcoded values 2012-11-14 14:36:59 +04:00
LeonidBeynenson
52a136227d Modified documentation for calcOpticalFlowSF. 2012-11-14 14:27:41 +04:00
marina.kolpakova
8acfbde68e remove debug detect at scale method 2012-11-14 14:22:12 +04:00
marina.kolpakova
72e2b8b370 remove size constraints of input frame 2012-11-14 14:00:02 +04:00
marina.kolpakova
08910e81af integrate pre-Kepler architectures 2012-11-14 12:40:44 +04:00
marina.kolpakova
e3c93ad9cf Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4 
This reverts commit 7e301c5c0e, reversing
changes made to b5e009eb87.
 2012-11-13 23:52:18 +04:00
marina.kolpakova
be40bd5c74 Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu' 2012-11-13 23:37:44 +04:00
Alexander Mordvintsev
9cfa51a483 added CV_OUT to StereoVar output paramiter 2012-11-13 23:17:54 +04:00
marina.kolpakova
1edab12068 fix for negative confidence 2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400 Merge pull request #147 from taka-no-me/win_warnings 2012-11-13 19:48:59 +04:00
Andrey Kamaev
0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Andrey Kamaev
72a63922d2 Merge pull request #156 from jet47/gpu-hough-lines-fix 2012-11-13 18:24:36 +04:00
Andrey Kamaev
e4fb680566 Merge pull request #155 from jet47/gpu-test-fix 2012-11-13 18:23:52 +04:00
Andrey Kamaev
5bc66ec8e4 Merge pull request #149 from taka-no-me/osx_warnings 2012-11-13 18:21:40 +04:00
Andrey Kamaev
a218507586 Merge pull request #148 from taka-no-me/tutorial_codes 2012-11-13 18:20:49 +04:00
Andrey Kamaev
8ba9289a2c Merge pull request #146 from taka-no-me/win_opengl 2012-11-13 18:19:42 +04:00
Andrey Kamaev
4d6bdc1533 Merge pull request #145 from taka-no-me/vec_print 2012-11-13 18:18:48 +04:00
Andrey Kamaev
c803cbb93b Merge pull request #143 from vpisarev/bug_fixes4 2012-11-13 18:17:33 +04:00
Vladislav Vinogradov
a9919e01d0 fixed bug in gpu::HoughLines 2012-11-13 17:54:17 +04:00
Vladislav Vinogradov
606c23b9aa fixed gpu module tests 
uses old CommandLineParser class
 2012-11-13 17:50:29 +04:00
Alexander Smorkalov
96e4eed018 Logcat message for disabled test cases added. 2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea More common way of test case disabling implemented. 2012-11-13 10:29:49 +04:00
marina.kolpakova
bd9ca48fab export to python/java 2012-11-13 02:49:35 +04:00
Alexander Smorkalov
e06c5b6fd5 Code review comments applied. 2012-11-12 17:47:20 +04:00
marina.kolpakova
aa92be34d6 GK107 Policy 2012-11-12 16:37:18 +04:00
marina.kolpakova
580d8173e5 refactor computing of scaling factor 2012-11-12 11:54:40 +04:00
Vladislav Vinogradov
afff9cf716 Optimized buffers reuse in gpu module: 
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
 2012-11-12 10:30:35 +04:00
Vladislav Vinogradov
810829f32e speedup compilation of row_filter.cu and column_filter.cu 
split them into several small files
 2012-11-12 10:16:04 +04:00
Vladislav Vinogradov
29f89e8930 moved block.hpp to include folder 2012-11-12 09:51:31 +04:00
marina.kolpakova
d3ac282487 GPU soft cascade documentation 2012-11-10 05:48:06 +04:00
marina.kolpakova
916967cac5 add comments to class declaration 2012-11-10 05:13:37 +04:00
marina.kolpakova
0cbf9eb22a add support for CUDA streams 2012-11-10 05:13:26 +04:00
marina.kolpakova
40600fa504 GPU version becomes algorithm 2012-11-10 05:13:19 +04:00
marina.kolpakova
e6eb1b99e1 fix negative confidence bug 2012-11-10 05:13:01 +04:00
marina.kolpakova
27eb2e27db enable fast integral for Kepler 2012-11-10 05:12:48 +04:00
marina.kolpakova
9b251f8130 remove Sobel normalization 2012-11-10 05:12:38 +04:00
marina.kolpakova
df392cc830 use fast integral for soft cascade 2012-11-10 05:12:27 +04:00
marina.kolpakova
ac5cd48279 add DeviceInfo parameter to the soft cascade tests 2012-11-10 05:12:13 +04:00
marina.kolpakova
fba62c9251 fix compilation problem after rebase 2012-11-10 05:12:01 +04:00
marina.kolpakova
2bd35c4358 add support for precomputed integrals 2012-11-10 05:11:48 +04:00
marina.kolpakova
fa55d51b6a add sanity check to performance tests for soft cascade 2012-11-10 05:11:35 +04:00
marina.kolpakova
ca81628a9a fix retrieval of detections count 2012-11-10 05:11:21 +04:00
marina.kolpakova
022a8b9698 fix rounding bug in Level creation 2012-11-10 05:11:11 +04:00
marina.kolpakova
2bcb8dbd83 refactor performance tests 2012-11-10 05:11:00 +04:00
marina.kolpakova
f196e9fda4 add factory method for Fields structure 2012-11-10 05:10:42 +04:00
marina.kolpakova
0898c3c651 kernel policy 2012-11-10 05:10:35 +04:00
marina.kolpakova
916ba4c0ea refactor preprocessing 2012-11-10 05:10:28 +04:00
marina.kolpakova
fa62e2b72f move preprocessing into separate function 2012-11-10 05:10:13 +04:00
marina.kolpakova
312a58fcec fix performance test 2012-11-10 05:10:03 +04:00
marina.kolpakova
ef431f70b6 fix buggy threshold zeroing if feature has zero area 2012-11-10 05:09:45 +04:00
marina.kolpakova
0424e2c8d2 remove debug code 2012-11-10 05:09:34 +04:00
marina.kolpakova
1b9bccb856 move Level into shared memory 2012-11-10 05:09:15 +04:00
marina.kolpakova
30bce16ad6 optimize roi loads 
only one thread load roi for all block
 2012-11-10 05:08:56 +04:00
marina.kolpakova
fdef0adf95 Corrects objects matrix in case of the absence of objects 2012-11-10 05:08:43 +04:00
marina.kolpakova
838842cc96 Add performance detection test in ROI; refactored soft cascade performance tests 2012-11-10 05:08:32 +04:00
marina.kolpakova
dd595376ba Add performance test for detection in ROI; refactor soft cascade performance tests 2012-11-10 05:08:09 +04:00
marina.kolpakova
eb91593c08 add roi support 2012-11-10 05:08:03 +04:00
marina.kolpakova
64d6e6a48d add getROISize 2012-11-10 05:07:55 +04:00
marina.kolpakova
672cf1f445 implement different behaviour for up- and down-scaling 2012-11-10 05:07:40 +04:00
marina.kolpakova
56c7ef06e7 integrate Kepler version 2012-11-10 05:07:26 +04:00
marina.kolpakova
7db1323f81 add test that stores detections on the specific scale 2012-11-10 05:07:09 +04:00
marina.kolpakova
b52fea7fae update soft cascade interface: - add class Detection in interface, - split sync- and async- versions, - add support for detecting at the specific scale. 2012-11-10 05:06:54 +04:00
marina.kolpakova
612a258506 kepler specific version 2012-11-10 05:06:44 +04:00
marina.kolpakova
0314e0e5d7 add kind in detection representation 2012-11-10 05:06:30 +04:00
marina.kolpakova
c0359ed5c5 fix test: enough size for detection matrix 2012-11-10 05:06:17 +04:00
marina.kolpakova
72b499df00 add detection storing 2012-11-10 05:06:05 +04:00
marina.kolpakova
8108bd30fe optimize memory usage 2012-11-10 05:05:43 +04:00
marina.kolpakova
b83d4add2e memory optimization 2012-11-10 05:05:25 +04:00
marina.kolpakova
4d9c7c1012 preprocessing ~1.981 ms 2012-11-10 05:05:17 +04:00
marina.kolpakova
1917366528 empty cascade 2012-11-10 05:05:09 +04:00
marina.kolpakova
4881205bae refactor logs 2012-11-10 05:04:52 +04:00
marina.kolpakova
dca27b4622 fix cast bug; add logging 2012-11-10 05:04:36 +04:00
marina.kolpakova
e606a0d651 remove dead code 2012-11-10 05:04:20 +04:00
marina.kolpakova
ba50d19341 first version of soft cascade on GPU 2012-11-10 05:03:59 +04:00
marina.kolpakova
1bf85996b3 add detections vector initialization in tests 2012-11-10 05:03:43 +04:00
marina.kolpakova
08b4e780de add shrinking kernel 2012-11-10 05:03:29 +04:00
marina.kolpakova
1cf7a46f3a fix data paths in performance test 2012-11-10 05:03:05 +04:00
marina.kolpakova
0691dc554f fix compilation 2012-11-10 05:02:52 +04:00
marina.kolpakova
5d15e4ea58 CUDA kernels interface 2012-11-10 05:02:37 +04:00
marina.kolpakova
1a52a322b5 add performance test for GPU soft cascade 2012-11-10 05:02:16 +04:00
marina.kolpakova
14a0dd8c98 fix typo in cascade loading 2012-11-10 05:02:01 +04:00
marina.kolpakova
a3af5ede80 CUDA callers 2012-11-10 05:01:44 +04:00
marina.kolpakova
4aac1444ad integral channel storage are cached as a cascade's field 2012-11-10 05:01:25 +04:00
marina.kolpakova
1ab7af6995 GPU soft cascade: buffers preallocation 2012-11-10 05:01:09 +04:00
marina.kolpakova
2b7ce8b160 precompute feature response for scaling factor 2012-11-10 05:00:53 +04:00
marina.kolpakova
267d140bfe soft cascade: gpu representation 2012-11-10 05:00:33 +04:00
marina.kolpakova
dd9c53497b GPU interface for soft cascade 2012-11-10 05:00:16 +04:00
marina.kolpakova
d65b3e0617 fix warning in CUDA samples 2012-11-10 04:59:55 +04:00
Alexander Smorkalov
baef62b4d2 Java test fix. Eclipse test execution fix. 2012-11-09 11:46:14 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
b131dfeecd Build tutorial codes together with other samples 
These codes should be included into regular builds.
 2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01 Fix Windows build warnings 2012-11-09 10:10:04 +04:00
Andrey Kamaev
8c9c2b3a03 Fix build on Windows with OpenGl enabled 
There was missing windows.h include in OpenGL interop code.
 2012-11-09 10:00:24 +04:00
Andrey Kamaev
e5ffbf9498 Fix stream output operator for Vec<uchar,n> 
This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.
 2012-11-09 09:54:43 +04:00
marina.kolpakova
665bf430d5 fix warnings under win 2012-11-09 00:07:32 +04:00
Vadim Pisarevsky
2e54e2a586 fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility. 2012-11-08 16:15:04 +04:00
Vladislav Vinogradov
bff818afbd fixed static build of gpu module with ffmpeg: 
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
 2012-11-08 15:49:56 +04:00
Vadim Pisarevsky
9163471987 improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525) 2012-11-08 14:09:43 +04:00
marina.kolpakova
8a3e897999 min and max params become double 2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03 git warning 2012-11-08 02:34:49 +04:00
marina.kolpakova
f93cffaa0d fix compilation under win 2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0 fix levels computing 2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6 clean code 2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161 fixed typo 2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360 fix angle scaling 2012-11-08 02:34:49 +04:00
marina.kolpakova
31a073ca66 documentation 2012-11-08 02:34:49 +04:00
marina.kolpakova
4207552e19 add object init 2012-11-08 02:34:49 +04:00
marina.kolpakova
157ab66ab9 add ROI support 2012-11-08 02:34:49 +04:00
marina.kolpakova
6a3a723938 refactor integral channels 2012-11-08 02:34:48 +04:00
marina.kolpakova
65543c53f6 update test according to resize usage 2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862 soft cascade become Algorithm 2012-11-08 02:34:48 +04:00
Vladislav Vinogradov
a0be7b57f5 fixed bug in gpu::PyrLKOpticalFlow::dense 
vector index out of range
 2012-11-07 17:13:19 +04:00
NikoKJ
95869a6081 fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch. 2012-11-07 13:49:09 +08:00
marina.kolpakova
ff8417db00 remove input frame size constraints 2012-11-07 03:19:07 +04:00
marina.kolpakova
3cb9afb4e7 test update because changed Sobel Normalization 2012-11-07 03:19:07 +04:00
marina.kolpakova
a84334cfc2 brief soft cascade interface description 2012-11-07 03:19:07 +04:00
marina.kolpakova
2e8ed77383 get rid of hard-coded values 2012-11-07 03:19:07 +04:00
marina.kolpakova
16dd09ccfc move scale related parameters to SoftCascade constructor 2012-11-07 03:19:07 +04:00
marina.kolpakova
017d970b9a load SoftCascade from FileStorage 2012-11-07 03:19:06 +04:00
marina.kolpakova
a22ee13620 rename markDetection to addDetection 2012-11-07 03:19:06 +04:00
marina.kolpakova
40c0c60e2b remove unused struct 2012-11-07 03:19:06 +04:00
marina.kolpakova
7b6da394f0 rename Stage to Weak because there is no such term for Soft Cascades 2012-11-07 03:19:06 +04:00
marina.kolpakova
2d0fc80c95 use IntegralChannels class 2012-11-07 03:19:06 +04:00
marina.kolpakova
3d41846c39 move frame processing into separate class 2012-11-07 03:19:06 +04:00
marina.kolpakova
5651743784 remove debug imshow from code 2012-11-07 03:19:06 +04:00
marina.kolpakova
8e092f8b5d add Detection struct to interface 2012-11-07 03:19:06 +04:00
marina.kolpakova
754fd7311b improve pointer usage 2012-11-07 03:19:06 +04:00
marina.kolpakova
2914f24521 improve cpu version of SoftCascade: 
- remove division
 - remove cvRound
 - cache feature area
 2012-11-07 03:19:06 +04:00
marina.kolpakova
2d2c46e717 add const qualifier to detectMultiScale method 2012-11-07 03:19:06 +04:00
marina.kolpakova
9771c3c7ec remove Mat copying 2012-11-07 03:19:05 +04:00
marina.kolpakova
0ff8a4633d remove pow calculations 2012-11-07 03:19:05 +04:00
marina.kolpakova
cc300a69b1 add perfomance test for CPU soft cascade 2012-11-07 03:19:05 +04:00
marina.kolpakova
26af7d7389 refactor logs 2012-11-07 03:19:05 +04:00
marina.kolpakova
b6081438fa clean code 2012-11-07 03:19:05 +04:00
marina.kolpakova
296aa8854c fix hog channels 2012-11-07 03:19:05 +04:00
marina.kolpakova
efd2615844 fix floating point bug 2012-11-07 03:19:05 +04:00
marina.kolpakova
765dea9ddf fix bugs in the soft cascade detect method; add options for debug logging 
- WITH_DEBUG_OUT for logging cascade scales
- DEBUG_STORE_IMAGES for xml matrix serialization
- DEBUG_SHOW_RESULT to see detection result
 2012-11-07 03:19:05 +04:00
marina.kolpakova
ba27d89173 add feature rescaling according to Dollal's paper FPDW 2012-11-07 03:19:05 +04:00
marina.kolpakova
8d90b973b0 add detectAt to soft cascade 2012-11-07 03:19:05 +04:00
marina.kolpakova
801368ee82 refactoring 2012-11-07 03:19:05 +04:00
marina.kolpakova
6f53be4102 shrinking before integral calculation 2012-11-07 03:19:04 +04:00
marina.kolpakova
dc74ce20ab OpenCV friendly xml format for soft cascade 2012-11-07 03:19:04 +04:00
marina.kolpakova
c04725b681 add apply cascade method 2012-11-07 03:19:04 +04:00
marina.kolpakova
695827050f Integral images for ICF 2012-11-07 03:19:04 +04:00
marina.kolpakova
b0b85f36f6 add test for soft cascade detect method 2012-11-07 03:19:04 +04:00
marina.kolpakova
f01c5d9033 compute scales pyramid 2012-11-07 03:19:04 +04:00
marina.kolpakova
a54d456ad0 parse soft cascade from xml 2012-11-07 03:19:04 +04:00
marina.kolpakova
fe2c38be80 add method to fill soft cascade 2012-11-07 03:19:04 +04:00
marina.kolpakova
7290d8576d add ICF feature 2012-11-07 03:19:04 +04:00
marina.kolpakova
fb113e5ce4 scale pyramid calculations 2012-11-07 03:19:04 +04:00
marina.kolpakova
9966d7feba add structures for cascade representation 2012-11-07 03:19:04 +04:00
marina.kolpakova
108fd169f7 dummy soft cascade 2012-11-07 03:19:03 +04:00
Jason Newton
85880397c4 connectedcomponents: use opencv integral types, add to docs, fix up things for a python export 2012-11-05 12:02:53 -08:00
Jason Newton
4c0cb2576d connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version 2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b connectedComponents: warning free version 2012-11-05 08:10:29 -08:00
Vladislav Vinogradov
beb377b38c gpu implementation of Dual TV-L1 Optical Flow 2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Vadim Pisarevsky
9a08b7be45 fixed compile problem with the old Xcode (<4.5) 2012-11-02 15:29:16 +04:00
Andrey Kamaev
f2af0e7a57 Merge pull request #132 from taka-no-me/version-2.4.3 2012-11-02 14:31:30 +04:00
Andrey Kamaev
4ac5223afa Merge pull request #131 from taka-no-me/tegra-fast 2012-11-02 14:31:02 +04:00
Andrey Kamaev
828faf4e68 Merge pull request #129 from cuda-geek/CCL-test-fix 2012-11-02 14:30:20 +04:00
Andrey Kamaev
63ee26adda Merge pull request #127 from cuda-geek/apple2clang 2012-11-02 14:29:39 +04:00
Andrey Kamaev
4a2f626d85 Remove "-rc" suffix from version 2012-11-02 14:27:34 +04:00
Andrey Kamaev
dbb5a32453 Use Tegra version of cv::FAST 2012-11-02 13:16:16 +04:00
Vadim Pisarevsky
42471c082f possibly fixed compile errors in GPU module on Windows 2012-11-02 12:03:25 +04:00
marina.kolpakova
97cab339d2 fix Connected Components Labeling test crash 2012-11-01 23:59:01 +04:00
Kirill Kornyakov
1c77f0abfe Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator() 2012-11-01 22:28:46 +04:00
Kirill Kornyakov
2efd9b6ad7 Fixed a couple of minor issues in Javadocs 2012-11-01 22:28:46 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
LeonidBeynenson
02646427fb Fixed arguments of the function calcOpticalFlowSF. 2012-11-01 19:31:45 +04:00
marina.kolpakova
5ce9965459 Merge pull request #125 from taka-no-me:perf_tests 2012-11-01 19:31:33 +04:00
marina.kolpakova
358fcbd5b6 Merge pull request #115 from asmorkalov:java_test_data_update 2012-11-01 19:29:18 +04:00
marina.kolpakova
09dec4e873 Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb 2012-11-01 19:26:30 +04:00
marina.kolpakova
334f6344dd Merge pull request #120 from NikoKJ:ocl2.4.3 2012-11-01 19:16:22 +04:00
marina.kolpakova
9b92de9a88 Merge pull request #121 from branch asmorkalov:android_samples_fix 2012-11-01 19:11:53 +04:00
Vadim Pisarevsky
d9d4e8df6f fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++) 2012-11-01 16:37:39 +04:00
Andrey Kamaev
e3be5f138a Fixed sanity checks in several performance tests 2012-11-01 16:29:30 +04:00
Alexander Smorkalov
34896529d5 Review comments applied. 2012-11-01 16:19:11 +04:00
Andrey Kamaev
fd4909360f Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library. 2012-11-01 12:44:10 +04:00
Andrey Kamaev
7267d518d5 Fix build in Visual Studio 2005 2012-11-01 12:42:51 +04:00
Alexander Smorkalov
a1a2cb0aeb OpenCV Samples testing problems fixed: 
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
 2012-10-31 17:24:50 +04:00
Andrey Kamaev
b5ecb1d32d Merge pull request #111 from taka-no-me/algorithm/addParam-short 2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b Merge pull request #117 from vpisarev/doc_updates 2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb Merge pull request #110 from vpisarev/test_fixes2 2012-10-31 16:52:50 +04:00
Andrey Kamaev
f15e49041e Merge pull request #112 from taka-no-me/warnings 2012-10-31 16:51:35 +04:00
Vadim Pisarevsky
849a8c8d20 fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5 a minor bug fix for brute force 2012-10-31 16:01:56 +08:00
Vadim Pisarevsky
adc1d94e95 updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request 2012-10-30 15:25:46 +04:00
Andrey Kamaev
468eefe0ce Merge branch '2.4' 2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4 minor updates for doc redirections and tutorial images size 2012-10-30 15:06:13 +04:00
Alexander
b0106ca25e Test data form features2d updated. 2012-10-30 15:05:09 +04:00
Andrey Kamaev
f3a158c862 Merge pull request #102 from NikoKJ/ocl4_2.43 2012-10-30 13:01:57 +04:00
NikoKJ
9ccdd17376 eliminate all the warnings on win32 and win64 
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
 2012-10-30 13:01:42 +04:00
Vadim Pisarevsky
63bd6f9adf fixed compile errors in ocl tests; disabled a few problematic tests 2012-10-29 23:37:18 +04:00
marina.kolpakova
0f65dacb8b Merge pull request #104 from AoD314:master 2012-10-29 15:12:52 +04:00
marina.kolpakova
e55b2f7d60 Merge pull request #99 from jet47:tvl1-opt-flow 2012-10-29 15:00:40 +04:00
morozov.andrey
e0cfc0ccf5 fixed bug with incorrect syntax in CommandLineParser 2012-10-26 19:46:17 +04:00
Andrey Kamaev
ad982f4ed6 Turn off video IO perf tests on Android 2012-10-26 17:00:31 +04:00
Andrey Kamaev
fcad269e53 Specify sanity threshold for WarpPerspective perf test 2012-10-26 17:00:31 +04:00
Andrey Kamaev
84934f7bfc Fix SHORT data type support in Algorithm 
* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
  on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages
 2012-10-26 17:00:13 +04:00
Alexander Smorkalov
83d8bc8c55 Tutorial 1 updated. Execution time camera switching implemented. 
Some unification done to simplify camera switching.
 2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0 Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed. 
Some code refactoring done.
 2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955 Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed. 2012-10-26 13:30:20 +04:00
Andrey Kamaev
729d76ad09 Merge branch '2.4' 2012-10-25 15:32:48 +04:00
Andrey Kamaev
bbb2d27add Merge pull request #74 from taka-no-me/cl2cpp 2012-10-25 14:56:53 +04:00
Andrey Kamaev
63397e825c Cleanup CMakeLists.txt of ocl module 2012-10-25 14:55:37 +04:00
Andrey Kamaev
42414b5689 Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4 2012-10-25 14:52:50 +04:00
Vladislav Vinogradov
8db5b7d7d4 fixed warnings under Windows 2012-10-25 13:28:30 +04:00
Vladislav Vinogradov
0ad849d2fd Dual TV-L1 optical flow implementation 2012-10-25 11:25:35 +04:00
marina.kolpakova
772586801b Merge pull request #87 from jet47:cmd-parser-fix 2012-10-25 00:40:50 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac Fix remaining windows build warnings 2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Andrey Kamaev
ca20228956 Merge pull request #95 from apavlenko/perf-test/warp 2012-10-24 15:39:53 +04:00
Andrey Kamaev
6c5922542e Merge pull request #97 from asmorkalov/2.4 2012-10-24 15:02:05 +04:00
Vadim Pisarevsky
ae10ecd264 fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions) 2012-10-24 14:41:15 +04:00
Alexander Smorkalov
4f0f6686d1 Undefind behavior in Async Service Helper fixed. 2012-10-24 12:28:31 +04:00
Andrey Pavlenko
a94e80bea3 fixing typos in perf tests for warp funcs 2012-10-24 11:21:58 +04:00
Alexander Smorkalov
76bcf72ded 2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated. 2012-10-24 09:51:01 +04:00
LeonidBeynenson
d6aa3bd8ed Made changes in cv::Algorithm 
made it to give more verbose errors when arguments of wrong types are passed, added setters with types (e.g. setInt, etc)
 2012-10-23 21:37:27 +04:00
Andrey Kamaev
080b9bbcd3 Merge pull request #80 from apavlenko/android-samples-refactor 2012-10-23 20:53:59 +04:00
Andrey Kamaev
b88323afc3 Merge pull request #91 from taka-no-me/warnings/windows 2012-10-23 20:52:42 +04:00
Andrey Kamaev
f14a711bda Merge pull request #85 from Nerei/master 2012-10-23 20:47:56 +04:00
Andrey Kamaev
9b149edde6 Merge pull request #90 from taka-no-me/version_2.4.3-rc 2012-10-23 20:36:51 +04:00
Andrey Kamaev
8dbde3297e Merge branch '2.4' 2012-10-23 20:32:19 +04:00
Alexander Smorkalov
c1d42664bc Refactring. Bug fix. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046 Code review coments fixed. Lint wornings fixed. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
641ee645ab New sample framework integrated to Java part of SDK; 
Frame format setter added to both views.
 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0 openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK. 2012-10-23 20:06:33 +04:00
Andrey Kamaev
1a500813f6 Remove dead blobtrackingkalman.cpp 2012-10-23 18:20:07 +04:00
Andrey Kamaev
9751014067 Fix warnings from MSVC 10 64-bit 2012-10-23 18:20:07 +04:00
Andrey Kamaev
afc79e2a02 Fix warnings from MSVC 9 64-bit 2012-10-23 18:20:07 +04:00
Andrey Kamaev
0072078857 Hide non-windows variable in gtest 2012-10-23 18:09:49 +04:00
Andrey Kamaev
1d8729a7aa Don't use _interlockedExchangeAdd in case of GNU compiler 2012-10-23 18:09:49 +04:00
Andrey Kamaev
15b7b01243 Merge pull request #86 from taka-no-me/test/python_kmeans 2012-10-23 18:03:52 +04:00
Andrey Kamaev
6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
Andrey Kamaev
08e4298a96 Merge pull request #84 from Daniil-Osokin/perfTest-warpPerspective 2012-10-23 17:35:05 +04:00
Daniil Osokin
e9ba5c225d extended perf test warpPerspectiveLarge 2012-10-23 16:06:03 +04:00
Andrey Kamaev
e64bb3654a Remove wrong assertion 2012-10-23 15:28:44 +04:00
Vladislav Vinogradov
26f9534544 fixed string->string conversion 2012-10-23 15:24:21 +04:00
Anatoly Baksheev
d681717702 warnings 2012-10-23 15:13:46 +04:00
Andrey Kamaev
585f3bc391 Disable perf test for unstable solvePnPRansac 2012-10-23 12:13:39 +04:00
Andrey Kamaev
b45a870d9a Limit 32S data in perf test for addWeighted to avoid integer overflow 2012-10-23 12:07:32 +04:00
Andrey Kamaev
c13eb07d47 Fix argument parsing for old command line parser 2012-10-23 12:07:01 +04:00
Andrey Kamaev
22e352d9cc Merge pull request #76 vpisarev/test_fixes_1 2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW 2012-10-22 21:13:26 +04:00
Andrey Kamaev
781d89829f Merge pull request #79 from taka-no-me:warnings 2012-10-22 20:56:53 +04:00
Andrey Kamaev
2e91405833 Fix OS X build warnings 2012-10-22 20:33:14 +04:00
Andrey Kamaev
40030d2ca0 Fix windows build warnings 2012-10-22 19:13:18 +04:00
Andrey Kamaev
15076f9232 Fix implementation of PCA overload with retained variance parameter 2012-10-22 18:46:20 +04:00
Andrey Kamaev
d0ec65e80c Fix linux build warning 2012-10-22 18:38:22 +04:00
Andrey Kamaev
9900f8deb2 Remove russian comments 2012-10-22 17:24:43 +04:00
Andrey Kamaev
ecb707ca7b Convert cl2cpp.py script to cmake 
New version removes inner comments and empty lines
 2012-10-22 17:19:55 +04:00
Andrey Kamaev
57775988e7 Merge branch '2.4' 2012-10-22 16:57:56 +04:00
Andrey Kamaev
769f61f8c7 Merge pull request #55 from vpisarev/ocl_fixes 2012-10-22 16:40:18 +04:00
Andrey Kamaev
d1d6ce63fc Merge pull request #48 from kazuki-ma/2430_ostream_24 2012-10-22 16:27:10 +04:00
Vadim Pisarevsky
eea6fe8e7f Merge pull request #71 from NikoKJ/ocl4_2.4.3 
This patch is for the ocl module of 2.4.3

(tested on Mac (OSX 10.8, Xcode 4.5, OpenCL 1.1(?))
 2012-10-22 04:57:42 -07:00
marina.kolpakova
8e2f729aa7 Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4 2012-10-22 13:16:27 +04:00
Niko
5df77a841e remove redundant OPENCL_DIR flag 
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
 2012-10-22 15:14:22 +08:00
Maria Dimashova
78dd1893bb added tests for cv::merge, cv::split, cv::phase 2012-10-21 12:22:39 +04:00
marina.kolpakova
b14f447cc6 fix GPU SURF tests for masked case 2012-10-21 11:40:08 +04:00
marina.kolpakova
99c666691e Restore core multiply/divide depth to CV_64F value. 
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests  for multiply/device functions.
 2012-10-21 11:20:39 +04:00
Kazuki MATSUDA
72c93dabd3 Add stream operators (Requested #2430) 
Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.

And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_)
 2012-10-20 11:19:42 +09:00
Andrey Kamaev
b6a2717c2b Merge pull request #65 from taka-no-me:android/warnings 2012-10-19 20:49:19 +04:00
Andrey Kamaev
59452dfc6f Merge pull request #64 from vpisarev/bugs_1939_2100 2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
40a30b6f30 fixed type "compatible -> incompatible" in the error message 2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
d652cc72f2 fixed bugs #2100 (kind of) and #1393 
[edit: cleaned whitespace]
 2012-10-19 20:47:57 +04:00
Andrey Kamaev
8fb6d9f650 Fix Android build warnings 2012-10-19 16:14:14 +04:00
Andrey Kamaev
e8dd73798c Merge pull request #59 from taka-no-me:doc/fix-signatures-master 2012-10-19 15:03:26 +04:00
Andrey Kamaev
546ec2af65 Merge pull request #54 from taka-no-me:doc/fix-signatures 2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5 Merge branch '2.4' 2012-10-19 15:00:05 +04:00
Andrey Kamaev
09abcd567e Merge pull request #50 from taka-no-me:parallel/fix-build-2445 2012-10-19 14:57:08 +04:00
Andrey Kamaev
7173c82382 Include unistd.h to parallel.cpp on UNIX-like systems 
This fixes build without TBB and CUDA. Issue #2445
 2012-10-19 14:38:30 +04:00
Vladislav Vinogradov
34b4a35ea7 gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types 2012-10-19 12:41:14 +04:00
Andrey Kamaev
9a97c74ef3 Merge pull request #61 from vpisarev/bug_2509 2012-10-19 11:17:25 +04:00
Andrey Kamaev
1341c64290 Merge pull request #51 from taka-no-me/java/fix-build-after-normalization 2012-10-19 10:27:16 +04:00
Andrey Kamaev
65d07c56fb Merge pull request #57 from vpisarev/bug_2429_2.4 2012-10-18 19:42:14 +04:00
Andrey Kamaev
e1c3ffb23f Fix weight calculation for the last pixel in generic area resize. 
Also removed assigned only variable.
 2012-10-18 19:41:45 +04:00
Vadim Pisarevsky
80f9bd864f fixed bug #2429 
[edit: cleaned whitespace]
 2012-10-18 19:39:22 +04:00
Vadim Pisarevsky
c40718ab61 fixed bug #2059 2012-10-18 14:41:26 +04:00
Vadim Pisarevsky
f5742e6cac fix bug #2447 - unary operator bug for single column matrix 2012-10-18 13:28:01 +04:00
Andrey Kamaev
73bbabf207 Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-18 13:03:12 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-17 21:24:55 +04:00
Andrey Kamaev
57d077b936 Fix Java API generation after normalization 
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
 2012-10-17 18:20:46 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
vpisarev
f75946a16a made opencv_ocl module build with VS2012 2012-10-17 15:08:03 +04:00
Andrey Kamaev
7225f89ea2 Revert opencv_videostab to the state of 2.4.2 2012-10-17 02:09:43 +04:00
marina.kolpakova
e5437e5486 Fix binary compatibility of opencv_gpu 2012-10-17 02:09:40 +04:00
Andrey Kamaev
ed51162568 Fix binary compatibility of Java wrappers 2012-10-17 02:09:37 +04:00
Andrey Kamaev
42c8a42ad3 Fix binary compatibility of opencv_objdetect 2012-10-17 02:09:34 +04:00
Andrey Kamaev
a07cc84436 Fix binary compatibility of opencv_nonfree 2012-10-17 02:09:31 +04:00
Andrey Kamaev
26bcb3812c Fix binary compatibility of opencv_contrib 2012-10-17 02:09:28 +04:00