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
alexandre benoit
a0c92265db
minor updates for doc redirections and tutorial images size
2012-10-28 18:52:04 +01: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
Andrey Kamaev
971d02cde6
Fix binary compatibility of opencv_stitching
2012-10-17 02:09:26 +04:00
Andrey Kamaev
edee177ef1
Fix binary compatibility of opencv_ml
2012-10-17 02:09:23 +04:00
Andrey Kamaev
7d6a2f1bca
Revert "skip of table header in MLData ( #1962 )"
...
This reverts commit 4d36be8794
.
Conflicts:
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/src/data.cpp
2012-10-17 02:09:20 +04:00
Andrey Kamaev
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-17 02:09:17 +04:00
Andrey Kamaev
5a730d09cd
Fix binary compatibility of opencv_features2d
2012-10-17 02:09:14 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
075372a71c
Revert "fixed compilation error because of DetectionBasedTracker"
...
This reverts commit 9b8c47399a
.
2012-10-16 19:37:02 +04:00
Andrey Kamaev
e7b81688a4
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-16 19:35:57 +04:00
Andrey Kamaev
18ab16dbd3
Revert "some more fixes towards binary compatibility"
...
This reverts commit a8c5e35619
.
Conflicts:
modules/imgproc/src/imgwarp.cpp
2012-10-16 19:35:28 +04:00
Andrey Kamaev
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
Andrey Kamaev
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
.
Conflicts:
modules/imgproc/include/opencv2/imgproc/types_c.h
modules/legacy/include/opencv2/legacy/legacy.hpp
2012-10-16 15:13:00 +04:00
Andrey Kamaev
ebac3a02aa
Fix backward compatibility of opencv_core
2012-10-16 15:13:00 +04:00
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
.
Conflicts:
modules/core/doc/command_line_parser.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/cmdparser.cpp
modules/gpu/perf/main.cpp
modules/gpu/test/main.cpp
modules/ts/src/ts_perf.cpp
2012-10-15 20:01:44 +04:00
Andrey Kamaev
52e490ef88
Revert "fixed compile error under linux"
...
This reverts commit e2d9fc4dcc
.
2012-10-15 20:01:44 +04:00
Andrey Kamaev
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
.
2012-10-15 18:12:33 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Andrey Kamaev
3ffe0f0117
Remove unused tbb::task_scheduler_init from perf tests
2012-10-15 16:25:06 +04:00
Andrey Kamaev
c3881ede62
Refactor thread management in performance tests
2012-10-15 16:14:11 +04:00
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
2012-10-15 15:23:38 +04:00
Vadim Pisarevsky
5b2271c6fb
another fix for #2332 test
2012-10-15 14:12:32 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Andrey Kamaev
460644b8a4
Reimplement thread management functions:
...
* Refactor auto-detection of parallel frameworks
* Implement cv:getNumThreads, cv::setNumThreads and cv::getThreadNum for all supported frameworks
* From now cv::setNumThreads(0) can be used to turn off parallelisation
2012-10-15 12:44:16 +04:00
Andrey Kamaev
b54f59de90
Move thread-related functions implementation to parallel.cpp
2012-10-15 12:44:16 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Ilya Lavrenov
5f9aedbe01
fixed bug in cvtColor RGB(BGR) <-> Lab conversion
2012-10-15 12:21:16 +04:00
KOLANICH
c1f2b1fcc4
replaced python build script with WSH one for windows platforms
2012-10-12 23:03:30 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Kirill Kornyakov
e770691522
deleted wrong line
2012-10-12 17:31:26 +04:00
Kirill Kornyakov
de98da42f7
commented wrong line
2012-10-12 17:30:23 +04:00
Kirill Kornyakov
84176fa027
Added perf test for warpPerpsective with large resolutions
2012-10-12 17:14:23 +04:00
Vadim Pisarevsky
fa368d6202
Merge remote-tracking branch 'origin/master'
2012-10-12 16:29:20 +04:00
Vadim Pisarevsky
5474b4d4bc
finally, a proper fix for VNG (both SSE2 and C version)
2012-10-12 16:28:26 +04:00
marina.kolpakova
319e861cf2
FAIL_NO_CPU marco
2012-10-12 14:46:18 +04:00
marina.kolpakova
8d7ac8ad19
minor ending fix
2012-10-12 14:46:18 +04:00
marina.kolpakova
800cb9d0e6
allow gpu module write sanity data for GPU and CPU tests in one xml
2012-10-12 14:46:18 +04:00
Daniil Osokin
4500c48349
fixed 7 point mode in findFundamentalMat #1978
2012-10-12 14:38:52 +04:00
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +04:00
Vsevolod Glumov
b91ca6a73f
Removed the phrase, that was causing all the confusion. Issue #2406 .
...
+ Some minor formatting fixes.
2012-10-12 14:15:30 +04:00
Vadim Pisarevsky
7bbf8744d6
Merge remote-tracking branch 'origin/master'
2012-10-12 14:01:47 +04:00
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
2012-10-12 14:01:36 +04:00
marina.kolpakova
296aa7c4fb
One more fix for Kepler-specific gpu::integral usage
2012-10-12 13:45:09 +04:00
Daniil Osokin
1d3ec99102
fixed batchDistance minimum finding #2292
2012-10-12 13:25:55 +04:00
Andrey Kamaev
2abb67cc92
Merge pull request #29 from thorikawa/feature-523
2012-10-12 13:16:17 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Vladislav Vinogradov
304714862f
fixed bug in gpu::HOGDescriptor::computeConfidenceMultiScale
2012-10-12 12:49:10 +04:00
Andrey Kamaev
a390c1e2e6
Merge pull request #40 from emchristiansen/manualBRISKFREAK
2012-10-12 12:31:11 +04:00
Eric Christiansen
594ce1c869
fixed indentation
2012-10-12 12:31:11 +04:00
Eric Christiansen
caebcdcb3d
Minor tweak to add BRISK and FREAK support for the Java wrapper
2012-10-12 12:31:11 +04:00
Andrey Kamaev
a3a658c034
Quiet MSVC warning
2012-10-12 12:19:34 +04:00
Vadim Pisarevsky
bddd06e6c4
another fix for the updated parallel_for_ implementation
2012-10-11 23:22:32 +04:00
Vadim Pisarevsky
d64438dcfd
fixed build errors in the case of TBB and Concurrency
2012-10-11 23:04:45 +04:00
Vadim Pisarevsky
8441cf700d
added function cv::findNonZero (patch #2205 )
2012-10-11 22:52:15 +04:00
Vadim Pisarevsky
d72cc06b96
fixed possibly inccorrect interval measurements in flann's timer (bug #1165 ). Note: this may break binary compatibility, but since the class is not wrapped in Java and not exposed in Windows API, for example (it's considered internal-use class for flann), the effect should be minimal
2012-10-11 22:40:37 +04:00
Vadim Pisarevsky
354a5f2686
added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance)
2012-10-11 22:37:14 +04:00
Andrey Kamaev
821de96346
Adjust thresholds in sanity checks for batchDistance
2012-10-11 20:35:28 +04:00
Andrey Kamaev
b8a67dc0e3
Adjust thresholds in sanity checks for calcOpticalFlowPyrLK
2012-10-11 19:46:18 +04:00
Alexander Smorkalov
5a524bdfd7
Issue #1861 Improve Javadoc documentation fixed. Multiline code segments added to Javadoc.
2012-10-11 19:21:40 +04:00
Andrey Kamaev
97640847c5
Add methods to sort keypoints and corresponding descriptors
2012-10-11 18:25:45 +04:00
Andrey Kamaev
18295bc778
Improve performance tests failures formatting
2012-10-11 17:41:02 +04:00
Andrey Kamaev
8f44f25f47
Fix AndroidManifest.xml generation for OpenCV Android library project (second attempt)
2012-10-11 17:09:57 +04:00
Andrey Kamaev
f41ab3a330
Merge pull request #34 from roynos/master
2012-10-11 16:31:20 +04:00
Andrey Kamaev
7cb525d63f
Fix AndroidManifest.xml generation for OpenCV Android library project
2012-10-11 15:47:57 +04:00
Andrey Kamaev
dc4a649513
Fix OS X build
2012-10-11 15:36:47 +04:00
Andrey Kamaev
be98693aaf
Enable parallel CvtColorLoop for all platforms
2012-10-11 15:05:43 +04:00
Andrey Kamaev
df94591336
Fix instability of Luv/Lab color conversions
2012-10-11 15:05:43 +04:00
Vadim Pisarevsky
7ee6040192
enable Matx as Mat elements (bug #1705 ).
2012-10-11 15:02:48 +04:00
Daniil Osokin
e435674a90
added perf test for gabor filter
2012-10-11 14:52:35 +04:00
Daniil Osokin
f1e025dc68
delete normalization in gabor kernel #1995
2012-10-11 14:40:15 +04:00
Evgeny Talanin
bd4620f04e
#2408 patch apply (see pull request at https://github.com/Itseez/opencv/pull/33 )
2012-10-11 14:38:25 +04:00
Vadim Pisarevsky
43e3b83832
fixed potential memory buffer corruption in StereoSGBM (patch #2203 )
2012-10-11 14:07:07 +04:00
Evgeny Talanin
8528b0abcd
#1941 fix
2012-10-11 13:45:21 +04:00
Vadim Pisarevsky
56d3cad326
enabled odd size in DFT_COMPLEX_OUTPUT test
2012-10-11 12:27:10 +04:00
niko
97156897b2
format files to ANSI C style with coolformat
...
change the download channels to oclchannles()
fix bugs of arithm functions
perf fix of bilateral
bug fix of split test case
add build_warps functions
2012-10-11 16:22:47 +08:00
Vadim Pisarevsky
37ad10bf0d
fixed bug with partly uninitialized output of dft with DFT_COMPLEX_OUTPUT flag (bug #2223 )
2012-10-11 00:53:43 +04:00
Vadim Pisarevsky
63c9412922
enable huge value range in highgui sliders on Windows (patch #941 )
2012-10-10 23:05:15 +04:00
Andrey Kamaev
354b77e2e1
Applied fix from bug #2324 : ocv_list_unique makes for incorrect linking
2012-10-10 19:40:55 +04:00
Andrey Kamaev
d6a8753124
Remove second argument from VideoCapture_Reading perf test
2012-10-10 19:40:19 +04:00
Andrey Kamaev
d40083a926
Add concurrency test for solvePnPRansac
2012-10-10 18:23:11 +04:00
Andrey Kamaev
423837ddae
Restore theRNG seed reset on test SetUp as it is still needed
2012-10-10 18:07:03 +04:00
Vadim Pisarevsky
0e314163e5
fixed INT64_C & UINT64_C definitions (patch #2033 )
2012-10-10 17:27:32 +04:00
Oleg Sklyarov
2f4e8ee73e
Merge branch 'master' of git://code.opencv.org/opencv
2012-10-10 17:05:29 +04:00
Oleg Sklyarov
3f61b9792b
fixed bug #2407 : run.py now understands android device names with spaces
2012-10-10 16:59:00 +04:00
Vladislav Vinogradov
a008d6fc17
fixed bug #2425 : Concurrent convolutions with streams
2012-10-10 16:55:16 +04:00
marina.kolpakova
b28acfc12e
add GPU module specific command line arguments
2012-10-10 16:13:25 +04:00
marina.kolpakova
f88be98ec4
print information message about target device for GPU module tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
715a0032e0
add sanity checks into the denoising gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
45190aea47
add sanity checks into the features2d gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
2243645d36
add sanity checks into the objdetect gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
3de2023c61
add sanity checks into the calib3d gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
dce323a67b
add sanity checks into the video gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
d7ef6f078f
temporarily disable HoughLines test
2012-10-10 16:13:25 +04:00
marina.kolpakova
3dbfde421c
add sanity checks into the matop gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
2a277fb777
add sanity checks into the filters gpu performance tests
2012-10-10 16:13:25 +04:00
marina.kolpakova
1e344d7eba
add sanity checks into the imgproc gpu performance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
e46e928429
add sanity checks in core gpu pefrormance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
f5d6367ea1
GPU module performance tests are aligned with other OpenCV pefrofmance tests
2012-10-10 16:13:24 +04:00
marina.kolpakova
10f1004465
move GPU utiluty functions in utility.cpp
2012-10-10 16:13:24 +04:00
marina.kolpakova
a9ab26f799
main.cpp moved to perf_main.cpp
2012-10-10 16:13:24 +04:00
Vladislav Vinogradov
ece77e3930
fixed cvtColor parameter in KeypointBasedMotionEstimatorGpu::estimate
2012-10-10 16:07:07 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Daniil Osokin
1516a6169a
fixed one more msvc warning in tbb kmeans
2012-10-10 14:53:29 +04:00
Daniil Osokin
cc2d12b3e6
fixed msvc warning in tbb kmeans
2012-10-10 14:35:28 +04:00
Alexander Smorkalov
9ad5fd709b
Fixed Javadoc problems with ">" and "<" symbols.
2012-10-10 13:31:03 +04:00
Andrey Kamaev
006a4ba529
Fix gcc build error introduced in a9f36df
2012-10-10 13:24:49 +04:00
Andrey Kamaev
cabddaeb4f
Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed."
...
This reverts commit 36135fc59d
.
2012-10-10 13:24:49 +04:00
daniil.osokin
e83ff354bd
added TBB for kmeans (patch #1261 : thanks to Boris Mansencal)
2012-10-10 12:51:12 +04:00
daniil.osokin
a245161de6
added perf test for kmeans
2012-10-10 12:51:11 +04:00
Alexander Smorkalov
36135fc59d
Issue #2035 Calling cv::namedWindow crashes on Android fixed.
...
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
2012-10-10 12:40:36 +04:00
Alexander Smorkalov
306ed9801a
Issue #2284 BaseLoaderCallback requires use of Activity fixed.
2012-10-10 11:44:01 +04:00
Andrey Kamaev
a9f36dfcfe
Fix read after the end of local buffer in SSE-optimized TYPE_5_8 and TYPE_7_12 FAST cornerScore
2012-10-10 02:32:47 +04:00
Andrey Kamaev
56b27bcc7e
Fix inconsistent argument type in HammingLUT distance (flann)
...
this fixes 64-bit MSVC warning
2012-10-10 00:31:22 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +04:00
Vadim Pisarevsky
e365726c4a
fixed example of iteration through a SparseMat (bug #2310 )
2012-10-09 22:16:57 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
89de0bebd8
Merge remote-tracking branch 'origin/master'
2012-10-09 21:52:56 +04:00
Vadim Pisarevsky
3243ad3483
applied patch #1473 (timestamp retrieval in OpenNI)
2012-10-09 21:52:41 +04:00
Andrey Kamaev
0afd51253d
Add else branch to previous fix
2012-10-09 20:34:10 +04:00
Andrey Kamaev
34bfda10ca
Fix regression in core arithmetic
2012-10-09 20:25:36 +04:00
Andrey Kamaev
8ebd04cbf9
Fix sanity checks in highgui module
2012-10-09 19:39:03 +04:00
Andrey Kamaev
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
Andrey Kamaev
7cc67701a6
Add sanity checks to stitching perf tests
2012-10-09 19:17:58 +04:00
Andrey Kamaev
39d6eb7312
Add sanity check support for vector<DMatch>
2012-10-09 19:17:58 +04:00
Andrey Kamaev
d970a9159e
Add sanity checks to nonfree module
2012-10-09 19:17:58 +04:00
Kirill Kornyakov
e8a173bcaf
Merge branch 'master' of git://5.9.49.245/opencv
2012-10-09 18:57:02 +04:00
Kirill Kornyakov
9b8c47399a
fixed compilation error because of DetectionBasedTracker
2012-10-09 18:55:20 +04:00
Andrey Kamaev
5047f2d64d
Fix perf tests in features2d module
2012-10-09 18:41:27 +04:00
Andrey Kamaev
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
Andrey Kamaev
5a5c477be6
Make performance tests for solvePnPRansec more determenistic
2012-10-09 18:41:26 +04:00
Andrey Kamaev
d4cf9e22cc
Fix terrible perf test for FAST detector
2012-10-09 18:41:26 +04:00
Andrey Kamaev
b95923360d
Add sanity checkes to video module perf tests
2012-10-09 18:41:26 +04:00
Alexander Smorkalov
9a76573172
Auto expand of OpenCV version for Android Library prject and some documentation pages added.
2012-10-09 18:30:58 +04:00
Vadim Pisarevsky
b0ad424087
fixed several warnings from VS2010
2012-10-09 17:24:37 +04:00
Vadim Pisarevsky
a135e862c1
made opencv headers windows.h-less (Bug #2122 )
2012-10-09 17:12:42 +04:00
Vadim Pisarevsky
df8364ce63
Fixed "arr = NaN" case (bug #2056 )
2012-10-09 16:28:31 +04:00
Vadim Pisarevsky
d54f4e1cfb
added #undef True/False to avoid collision with X11 (Patch #1562 )
2012-10-09 16:02:06 +04:00
Vadim Pisarevsky
a8c5e35619
some more fixes towards binary compatibility
2012-10-09 15:56:16 +04:00
Andrey Kamaev
e2ff0ed1fb
Add sanity checks to objdetect module perf tests
2012-10-09 15:28:51 +04:00
Andrey Kamaev
c146c54bcd
Fix sanity checks for empty objects
2012-10-09 15:28:51 +04:00
Andrey Kamaev
f8672d49a0
Add sanity checks to calib3d perf tests
2012-10-09 15:28:51 +04:00
Evgeny Talanin
7c71c8fa52
#2258 fix
2012-10-09 14:52:47 +04:00
Alexander Smorkalov
4b808b1199
RESTART_REQUIRED status removed from OpenCV Manager API;
...
OpenCV info library name fixed;
Minimum API level for OpenCV library project increased up to 3 for using message dialogs.
2012-10-09 10:34:40 +04:00
Anatoly Baksheev
408e0dcbd0
Fixed output log in GPU perf tests
2012-10-09 00:44:48 +04:00
Anatoly Baksheev
c9bcbda827
more compilation fixes
2012-10-09 00:12:28 +04:00
Anatoly Baksheev
91a1a71de2
fixed compilation under Ubuntu without CUDA
2012-10-08 22:44:11 +04:00
Anatoly Baksheev
bc0d0c8f31
fixed compilation without CUDA
2012-10-08 21:49:40 +04:00
Andrey Kamaev
13bfcd643e
Fix sanity checks in improc perf tests
2012-10-08 21:37:58 +04:00
Andrey Kamaev
a3ab6d147d
Fix CV_ENUM macro instability
2012-10-08 21:37:58 +04:00
Vadim Pisarevsky
4be7619ce4
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
2012-10-08 21:37:15 +04:00
Vadim Pisarevsky
618fbf5508
yet another portion of changes towards the binary compatibility
2012-10-08 21:36:27 +04:00
Anatoly Baksheev
5b31c46c4f
added MatCn enum to GPU perf tests
2012-10-08 19:57:20 +04:00
Anatoly Baksheev
9a4265a8d0
fast nlm (class version)
2012-10-08 19:57:20 +04:00
Anatoly Baksheev
4b5bbb7752
fast_nlm initial version
2012-10-08 19:57:19 +04:00
Andrey Kamaev
2446c9329f
Remove bad perf test for cvRound
2012-10-08 18:40:41 +04:00
Andrey Kamaev
8c8ebd9ca6
Fix sanity checks for arithmetic tests on CV_32S data
2012-10-08 18:06:17 +04:00
Andrey Kamaev
6151a6ea0b
Make SANITY_CHECK required for all performance tests
2012-10-08 17:17:42 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Andrey Kamaev
25a9b0a255
Fix depth calculation for Scalar in core arithmetic
2012-10-08 16:15:27 +04:00
Andrey Kamaev
c0f2a8e0cc
Fix build without SSE
2012-10-08 16:08:16 +04:00
Alexander Smorkalov
febfdc9fa2
Wating for OpenCV library package installation added.
2012-10-08 14:37:59 +04:00
Alexander Smorkalov
11839e2cc9
Wating for OpenCV Manager installation added.
2012-10-08 14:37:59 +04:00
Alexey Spizhevoy
cb705aad1a
updated DP seaming to support 4 channel images
2012-10-08 14:29:10 +04:00
Vadim Pisarevsky
925d0cc769
added test for box filter 16u, fixed bug #2416
2012-10-08 14:11:39 +04:00
Ilya Lavrenov
280ecb68bf
changed file path
2012-10-08 13:27:28 +04:00
Ilya Lavrenov
2759f026e9
fixed Bug #2074
2012-10-08 12:59:15 +04:00
Andrey Kamaev
b486a59221
Quiet MSVC warning
2012-10-08 10:36:48 +04:00
marina.kolpakova
23699acca0
fix for bug 2264
...
fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7
2012-10-08 02:37:22 +04:00
Alexey Spizhevoy
2ec264303e
Added initial docs for the videostab module
2012-10-05 21:33:00 +04:00
Andrey Kamaev
73cb77842e
Replace jpegs with png (see 06a13d9
)
2012-10-05 18:15:44 +04:00
Vladislav Vinogradov
be19150672
deleted thrust header
2012-10-05 18:06:46 +04:00
Vladislav Vinogradov
ab3a5244ba
moved device layer headers to include directory
2012-10-05 18:04:23 +04:00
Vladislav Vinogradov
3ebec7448d
minor refactoring:
...
moved lbp.hpp to src/cuda folder
added missing cv::gpu::device namespace
deleted whitespaces
2012-10-05 17:43:22 +04:00
Ilya Lavrenov
a703df5456
parallel cvtColor for MSVS and Apple
2012-10-05 13:11:24 +04:00
Leonid Beynenson
2fd8ad65b9
Made changes in cv::DetectionBasedTracker -- now it can return status of the tracked objects
2012-10-04 20:50:59 +04:00
Andrey Kamaev
9218bdcbb4
TBB version of GridAdaptedFeatureDetector
2012-10-04 16:58:34 +04:00
Vladislav Vinogradov
8d07e92b2c
disabled NPP resize for 8uc4+Cubic (Bug #2388 )
2012-10-04 13:33:47 +04:00
Vladislav Vinogradov
cfc09d01c8
disabled NVidia test output by default
2012-10-04 13:33:06 +04:00
Roy Reapor
5d9d4659ad
Fixed issue 2404
...
- imdecode_() only creates a temporary file when needed.
- Use the string's empty() function to flag if the temporary file needs
to be deleted.
2012-10-03 23:06:59 -07:00
Roy Reapor
aa400c5837
Fixed issue 2403
...
Created temporary files are now deleted in Win32.
2012-10-03 22:44:29 -07:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Vladislav Vinogradov
11367e2c3d
added GpuMat support to OutputArray
2012-10-02 14:34:17 +04:00
Vadim Pisarevsky
b2bf90e951
fixed build errors in java bindings on desktop in Debug mode
2012-10-02 10:49:19 +04:00
Anatoly Baksheev
4df537bc1c
warnings
2012-10-01 23:57:38 +04:00
Anatoly Baksheev
55b1d7c097
added CUDA_DISABLER preprocessor commands
2012-10-01 23:57:38 +04:00
Anatoly Baksheev
46874d40df
warnings under windows
2012-10-01 23:57:37 +04:00
Ilya Lavrenov
c560a78c65
stable cvtColor
2012-10-01 18:52:27 +04:00
Ilya Lavrenov
45593030ab
fixed TestRemap_Remap
2012-10-01 17:29:56 +04:00
Vadim Pisarevsky
57d9699058
added the note about 1-pixel border in findContours (relates to ticket #2362 )
2012-10-01 16:43:07 +04:00
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
2012-10-01 16:23:40 +04:00
Vadim Pisarevsky
420dd22258
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
2012-10-01 14:12:19 +04:00
marina.kolpakova
dc568d4de1
fix for 4-channels TIFF missing 'break' statement
2012-10-01 08:33:56 +04:00
Marius Muja
ae4ff999d7
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-28 10:40:51 -07:00
Marius Muja
5cf6c5f0b2
Added test to fix backwards compatibility with the way LSH was handled before comit 7236858b
2012-09-28 10:40:38 -07:00
Andrey Kamaev
06e7101795
Add Tegra optimization for fastNlMeansDenoising
2012-09-28 18:56:36 +04:00
Ilya Lavrenov
9ee87bd04b
added parallel version of CvtColorLoop - main inner function of cvtColor
2012-09-28 17:42:48 +04:00
marina.kolpakova
c6e741196a
fix device pointer alignmen in sft-based integral integration
2012-09-28 14:55:45 +04:00
marina.kolpakova
ed6885dd8b
fixed bit arifmetic in sft-based integral
2012-09-28 14:55:45 +04:00
Alexey Spizhevoy
eafb024112
fixed one of the log messages in the stitching module
2012-09-28 14:37:38 +04:00
Andrey Pavlenko
8c1550a4ec
a new Java test to imencode() with params
2012-09-27 19:11:02 +04:00
Marius Muja
7236858bea
Exposed HierarchicalClusteringIndex in OpenCV wrapper
2012-09-27 03:58:17 -07:00
Alexey Spizhevoy
317a27e9eb
fixed the bug #2385
2012-09-25 16:08:43 +04:00
Vadim Pisarevsky
60769f544f
possibly repaired FAST test (however, FAST<7/12> and <5/8> could still do something different than described in the paper)
2012-09-25 15:50:03 +04:00
Evgeny Talanin
6308be2c3e
Changed parallel_for to parallel_for_ in hog.cpp and cascadedetect.cpp
2012-09-25 12:18:33 +04:00
Ilya Lavrenov
b8c185de9f
changed map indexes in test_remap
2012-09-24 20:36:25 +04:00
Ilya Lavrenov
6a3d5a1355
reorganized the resize algorithm
2012-09-24 17:07:08 +04:00
Anatoly Baksheev
f059899329
fixed bug in nln (out of border access)
2012-09-24 17:01:44 +04:00
Vadim Pisarevsky
854902b077
lowered tolerance thresholds in BRISK tests
2012-09-24 16:31:07 +04:00
bitwangyaoyao
3579c61388
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-24 20:29:21 +08:00
bitwangyaoyao
09359982b1
some optimizations to ocl::pyrDown, PyrLK and Canny
2012-09-24 20:28:35 +08:00
Vadim Pisarevsky
d09b3828b8
fixed fail in arithmetic test
2012-09-24 16:14:19 +04:00
Kirill Kornyakov
494ae1562d
Added 240p resolution alias for perf tests
2012-09-24 15:44:11 +04:00
Ilya Lavrenov
33983bcbb7
edited misprint
2012-09-24 14:18:54 +04:00
Ilya Lavrenov
0e07b0d73a
uncommented auto enabling GCD on Mac
2012-09-24 14:18:15 +04:00
Ilya Lavrenov
9c89947433
edited misprint
2012-09-24 13:46:09 +04:00
Ilya Lavrenov
2627c91c5e
added platform specific definitions in resize algorithm
2012-09-24 12:57:39 +04:00
Ilya Lavrenov
077115bd4a
debug
2012-09-24 12:40:20 +04:00
Ilya Lavrenov
bb589a590e
debug
2012-09-24 11:35:46 +04:00
Vadim Pisarevsky
427ce1247a
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
2012-09-23 20:57:34 +04:00
Ilya Lavrenov
b7b32e74a5
some restructuring of resize algorithm code
2012-09-21 18:17:54 +04:00
Ilya Lavrenov
222303f24b
attempt
2012-09-21 17:25:42 +04:00
Ivan Korolev
a8ba2d7f52
Added Rotation motion mode in the videostab module
2012-09-21 17:04:28 +04:00
Anatoly Baksheev
3b075a50e9
fixed warnings under windows
2012-09-21 13:41:56 +04:00
niko
0abe7f3196
many bugs fix for intel's HD4000
...
from my svn 855
2012-09-21 16:51:45 +08:00
Alexey Spizhevoy
f3bc1aede1
removed obsolte global motion estimation method
2012-09-21 10:46:21 +04:00
Leonid Beynenson
46ce5976ae
Fix: Windows compilation error in CommandLineParser.
2012-09-20 18:11:33 +04:00
Leonid Beynenson
0bde00a88a
Changed CommandLineParser to make it less verbose
...
when it is unrequired.
2012-09-20 18:01:24 +04:00
Alexander Kapustin
858f437162
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-20 17:32:54 +04:00
Andrey Kamaev
44e8d76d74
Change denoising strength parameter from int to float
2012-09-20 17:27:48 +04:00
Alexander Kapustin
8f4ddad52d
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
2012-09-20 17:24:20 +04:00
Alexander Kapustin
bb3332508e
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
Conflicts:
modules/core/src/arithm.cpp
2012-09-20 16:59:48 +04:00
Vladislav Vinogradov
6f175a3c52
changed the type of the arguments to const reference (Bug #2376 )
...
ORB_GPU::downloadKeyPoints
ORB_GPU::convertKeyPoints
2012-09-20 13:52:04 +04:00
yao
2e36338636
remove warnings of some functions in ocl module
2012-09-20 09:23:11 +08:00
Andrey Pavlenko
3bad6ac0ee
This reverts commit 738d3fef38
.
2012-09-19 18:03:50 +04:00
Vadim Pisarevsky
1ded1597e7
fixed mixed-type array operations (bug #2336 )
2012-09-19 17:55:34 +04:00
Alexander Kapustin
738d3fef38
1. New function ActualScalarDepth was added
...
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
2012-09-19 17:08:25 +04:00
Vadim Pisarevsky
45fd6f509f
Merge remote-tracking branch 'origin/master'
2012-09-19 16:57:27 +04:00
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
Takahiro Horikawa
ec45453baa
#523 Fix the problem where the MaxSize parameter in cvHaarDetectObjects does not work when the flag CV_HAAR_SCALE_IMAGE is not set.
2012-09-04 20:46:42 -07: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
Vladislav Vinogradov
362df96cb9
renamed perf_main.cpp to main.cpp
2012-08-17 15:16:45 +04:00
Vladislav Vinogradov
6e4eb722a6
updated gpu performance tests
...
now it executes only on one device
added posibility to specify device on which tests will be executed
2012-08-17 15:14:14 +04:00
niko
2e685dcf0a
performance & bug fix for resize erode dilate sobel remap
2012-08-17 15:47:02 +08:00
Vladislav Vinogradov
ddca47040b
updated gpu accuracy tests
...
added posibility to specify device on which tests will be executed
2012-08-16 16:23:27 +04:00
Vladislav Vinogradov
cfdeb50335
updated mark_nvidia.py script
2012-08-16 12:54:00 +04:00
Vladislav Vinogradov
19462c871d
Forbid incorrect patchSize values in gpu::ORB
2012-08-15 17:24:53 +04:00
Vladislav Vinogradov
528ddb5647
fixed block size for old CC
2012-08-15 17:24:53 +04:00
Andrey Kamaev
65f8585630
#2229 Fix FREAK build on CentOS
2012-08-15 17:23:07 +04:00
Andrey Kamaev
859ee6087c
#2216 Forbid incorrect patchSize values in ORB
2012-08-15 16:54:40 +04:00
Andrey Kamaev
b0927397e9
#2225 Rename getConvertData to getConvertElem to match the headers and documentation
2012-08-15 15:34:33 +04:00
Vladislav Vinogradov
a9fba14898
added docs for gpu::HoughLines
2012-08-15 15:07:30 +04:00
Vladislav Vinogradov
97731c152d
fixed typo
2012-08-15 15:07:29 +04:00
Vladislav Vinogradov
db79022b85
fixed shared memory size for linesAccumShared
2012-08-15 15:07:29 +04:00
Andrey Kamaev
36fe62d7a5
#2245 Fix BFMatcher::radiusMatchImpl witch Hamming distance (thanks to Jukka Holappa)
2012-08-15 15:02:20 +04:00
Vladislav Vinogradov
456890e9e4
fixed warning C4512
2012-08-15 13:48:28 +04:00
Vladislav Vinogradov
647d4ae1f1
Merge branch 'hough-lines-gpu'
2012-08-15 13:24:46 +04:00
Vladislav Vinogradov
7928cec670
added linesAccumGlobal kernel
2012-08-15 13:18:35 +04:00
Vladislav Vinogradov
7ae94c571c
fixed build without cuda
2012-08-14 17:54:42 +04:00
Vladislav Vinogradov
34b9bd61a2
fixed failure
2012-08-14 17:42:15 +04:00
Maria Dimashova
d973d571a4
changed the value that replace NaNs in bilateralFilter_32f
2012-08-14 17:15:03 +04:00
Vladislav Vinogradov
c3fa7974e6
new optimized version
2012-08-14 17:00:57 +04:00
Daniil Osokin
f1d41d8b94
disabled whole perf test for distance transform
2012-08-14 13:01:52 +04:00
Vladislav Vinogradov
9201db32eb
fixed overflow bugs, updated perf tests
2012-08-14 12:33:47 +04:00
Daniil Osokin
2b53d2e6a4
Merge branch 'master' of code.opencv.org:opencv
2012-08-14 12:17:44 +04:00
Daniil Osokin
f4d4b0d742
disabled perf test on distance transform
2012-08-14 12:13:42 +04:00
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
2012-08-14 12:03:05 +04:00
Vladislav Vinogradov
1eefc69927
added accuracy and performance tests
2012-08-14 11:36:32 +04:00
Vadim Pisarevsky
70bb857c7e
Merge remote-tracking branch 'origin/master'
2012-08-13 21:22:17 +04:00
Vadim Pisarevsky
ff90c3eba6
possibly fixes #2242 and #2257
2012-08-13 21:22:06 +04:00
Andrey Kamaev
d525362cd5
Fixed 2 new Android build warnings
2012-08-13 19:24:31 +04:00
Vladislav Vinogradov
3703722a72
first naive version
2012-08-13 17:44:46 +04:00
Vladislav Vinogradov
941897aa3d
fixed build errors in bgfg_gmg
2012-08-13 17:00:21 +04:00
Alexey Spizhevoy
27eb5d07cf
Added getScale/setScale for image warpers (stitching module)
2012-08-13 14:39:47 +04:00
Vladislav Vinogradov
4dbc7600e7
added support of all types to BackgroundSubtractorGMG
2012-08-13 10:28:42 +04:00
bitwangyaoyao
fa78459c56
fix ocl/match_template compiling error on Linux
2012-08-11 13:10:43 +08:00
Daniil Osokin
45c49a9088
Added perf test
2012-08-10 17:37:48 +04:00
Daniil Osokin
0609f4e9b4
Added blur16x16 perf test
2012-08-10 17:36:45 +04:00
Daniil Osokin
b97b48ecb6
Added perf tests for histogram
2012-08-10 17:36:45 +04:00
Daniil Osokin
0b54739822
Added perf test for distanceTransform
2012-08-10 17:36:45 +04:00
Daniil Osokin
7a2eb514fa
Added color YUV422 perf test
2012-08-10 17:36:39 +04:00
Daniil Osokin
e37b9469da
Added perf tests
2012-08-10 17:17:09 +04:00
marina.kolpakova
c3ae08a13d
fixed typo in enum
2012-08-10 15:39:45 +04:00
Daniil Osokin
8f6a2438a7
Added perf test for remap
2012-08-10 15:04:04 +04:00
marina.kolpakova
575078502f
fixed perfomance test for CCL
2012-08-10 15:01:16 +04:00
Evgeny Talanin
19313923cc
Use github pat to get data for in python tests (files from code.opencv.org are received truncated sometimes)
2012-08-10 14:09:58 +04:00
Vladislav Vinogradov
7ff04a65f1
fixed build for old compute capabilities
2012-08-10 10:03:35 +04:00
yao
fa5113f303
add Canny to ocl module
2012-08-10 11:59:47 +08:00
marina.kolpakova
40c76b9de2
1.x related fixes
2012-08-09 18:48:25 +04:00
Vladislav Vinogradov
79ef454c5f
Merge branch 'bgfg-gmg-optimized' into bgfg-gmg-merged
2012-08-09 14:55:36 +04:00
Vladislav Vinogradov
827fa850f6
Merge branch 'bgfg-gmg-gpu' into bgfg-gmg-merged
2012-08-09 14:48:26 +04:00
Vladislav Vinogradov
1ecf491373
added updateBackgroundModel parameter
2012-08-09 14:46:27 +04:00
Vladislav Vinogradov
bfd9e6102a
added updateBackgroundModel parameter and release method
2012-08-09 14:37:08 +04:00
Vladislav Vinogradov
7f3296566c
added performance tests
2012-08-09 14:14:13 +04:00
Vladislav Vinogradov
77cae11a74
added docs for GMG_GPU
2012-08-09 13:28:28 +04:00
Vladislav Vinogradov
ace7e9d842
added release method to GMG_GPU
2012-08-09 13:13:04 +04:00
marina.kolpakova
634c9dae46
added performance test fot CCL
2012-08-09 12:42:27 +04:00
Vladislav Vinogradov
55f8310cac
fixed number of training mode operation
2012-08-09 12:37:35 +04:00
Vladislav Vinogradov
f7f1fb2bd7
added tests for VIBE_GPU and GMG_GPU
2012-08-09 12:30:55 +04:00
Vladislav Vinogradov
da38a95de6
fixed number of update operation
2012-08-09 12:28:30 +04:00
Vladislav Vinogradov
9ec96597cd
gpu version of GMG Background Subtractor
2012-08-09 11:31:08 +04:00
Vladislav Vinogradov
9b16563f44
fixed build warnings
2012-08-09 11:05:27 +04:00
Vladislav Vinogradov
fb5f366459
made BackgroundSubtractorGMG's parameters public
2012-08-09 10:23:24 +04:00
Andrey Kamaev
0ceb9b6a00
Fixed division by zero case in SphericalProjector::mapForward
2012-08-08 20:57:12 +04:00
Vladislav Vinogradov
42c1d4f4b1
new optimized version of BackgroundSubtractorGMG
2012-08-08 18:15:06 +04:00
Andrey Kamaev
017abbd963
Lowered acceptance threshold in Features2d_RotationInvariance_Detector_ORB.regression test
2012-08-08 17:15:46 +04:00
Andrey Pavlenko
1995b1a06c
duplicating cv::error() message to Android logcat
2012-08-08 16:39:24 +04:00
marina.kolpakova
5084511fff
reserved flags parameter for future usage
2012-08-08 15:51:56 +04:00
marina.kolpakova
3e8c35a347
added perf. test for GFF
2012-08-08 15:17:26 +04:00
marina.kolpakova
cbfee83b06
test: GFF same as cpu greedy implementation
2012-08-08 14:48:06 +04:00
marina.kolpakova
490622231a
refactored test code
2012-08-08 14:48:06 +04:00
niko
37ca6d378b
add performance test code for ocl module
2012-08-08 17:09:29 +08:00
yao
64e9cf5d75
add SURF and HOG to ocl module
2012-08-08 15:55:39 +08:00
Alexander Mordvintesv
a2df490914
added CV_IN_OUT to img argument of drawing functions
2012-08-08 11:18:52 +03:00
Alexey Spizhevoy
8c3984c5ff
Refactored the DP based seam finder
2012-08-07 23:55:06 +04:00
Alexander Mordvintesv
7db1f711f6
Merge branch 'master' of code.opencv.org:opencv
...
Conflicts:
samples/python2/common.py
samples/python2/feature_homography.py
samples/python2/plane_ar.py
samples/python2/plane_tracker.py
2012-08-07 23:21:56 +03:00
Alexander Mordvintesv
647b1dd96c
comment fixed
2012-08-07 23:19:13 +03:00
Alexander Mordvintesv
0998669d26
Revert "fixed LshIndex types in its constructor"
...
This reverts commit 54d68da8e7
.
2012-08-07 21:37:19 +03:00
Alexander Mordvintesv
0adf68ae62
work on #2100 : pyopencv_to functions now can receive argument information through ArgInfo structure. Non-contiguous input numpy arrays are copied. In case of non-contiguous output array the TypeError is thrown.
2012-08-07 21:03:17 +03:00
Vadim Pisarevsky
e2eb81bcb2
Merge remote-tracking branch 'origin/master'
2012-08-07 18:17:49 +04:00
marina.kolpakova
fc8c65ff15
HAVE_CUDA macro
2012-08-07 18:23:18 +04:00
marina.kolpakova
8e274c886c
Greedy Labeling implementation in correctness test
2012-08-07 18:23:18 +04:00
marina.kolpakova
e8e7b94443
test fix
2012-08-07 18:23:18 +04:00
Vadim Pisarevsky
36d3bbff8b
added description of FAST 5/8 and FAST 7/12 (by Vincent)
2012-08-07 18:17:30 +04:00
Vadim Pisarevsky
bcb499328d
Merge remote-tracking branch 'origin/master'
2012-08-07 18:00:10 +04:00
Andrey Kamaev
8aa2d6cddc
Fix several documentation build warnings
2012-08-07 18:00:09 +04:00
Vadim Pisarevsky
4b5f948307
added SSE2-optimized 3x3 invert by Grigoriy Frolov
2012-08-07 17:59:52 +04:00
alexey.spizhevoy
43d46c0e8b
Minor fix in the DP based seam estimator
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
7222f2724f
Fixed bug
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
85d1c463b9
Minor changes
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
897c2bbd14
Added support of 8UC3
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
a39bce204d
implemented DP-based seam estimation method
2012-08-07 16:24:21 +04:00
Vladislav Vinogradov
cd58b7e154
Merge branch 'master' of code.opencv.org:opencv
2012-08-07 16:09:04 +04:00
Vladislav Vinogradov
76d46e20de
fixed build with CUDA 4.2
2012-08-07 16:08:22 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Andrey Kamaev
a3527fc4d8
Add git support to run.py
2012-08-07 14:30:36 +04:00
Andrey Kamaev
1852cb7eab
Fix tegra build warnings
2012-08-07 14:29:51 +04:00
Vladislav Vinogradov
8624d18ca5
new implementation of gpu debayer
...
* without border extrapolation
* with aligned write
* process 4 pixels per thread in 8u case
2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
5ce896d9ee
added perf tests for new gpu::cvtColor functions
2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
b0461db43f
added missed device synchronization
2012-08-07 13:34:11 +04:00
Vladislav Vinogradov
7b025474e2
added debayer to gpu::cvtColor
2012-08-07 13:34:11 +04:00
marina.kolpakova
c0d3adef25
intervales for vector type support
2012-08-07 13:22:41 +04:00
marina.kolpakova
0bf10c9a47
added connectivityMask calculation function
2012-08-07 13:22:41 +04:00
marina.kolpakova
a9764dd910
fixed not defined macro warningds
2012-08-07 13:22:41 +04:00
marina.kolpakova
51433a9331
C.C. Labeling: added stream support
2012-08-07 13:22:41 +04:00
marina.kolpakova
350621057f
connected components labeling
2012-08-07 13:22:41 +04:00
yao
c03ac12fcd
Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries
2012-08-07 16:33:46 +08:00
yao
7741d585f5
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-07 08:37:38 +08:00
Andrey Kamaev
50d13ba5c4
Fixed xml name generation in run.py
2012-08-06 19:10:55 +04:00
Andrey Kamaev
9981b283a6
Fixed build warnings (including error in FAST)
2012-08-06 19:10:55 +04:00
yao
7d97e8112a
fix bugs in tests, set device for each test case
...
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-06 15:51:27 +08:00
yao
505cda43d1
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-06 15:01:21 +08:00
yao
0db69fbe19
Add blend, columnsum, pyrUp/down, matchTemplate for ocl module
2012-08-06 15:00:27 +08:00
Philipp Wagner
2c2d6fa5fd
Issue #2231 : Attempt to fix segfault, when copying labels. LDA needed to be updated to generate the Wrapper correctly.
2012-08-06 01:14:51 +02:00
Evgeny Talanin
064d022a4b
Set correct path to repo in python tests (changed after migration to git)
2012-08-03 17:50:55 +04:00
Vadim Pisarevsky
9c0f556d88
fixed a few compile warnings and errors with VS2010.
2012-08-03 17:12:45 +04:00
Vadim Pisarevsky
310b1ad7b9
moved parallel_for_ and ParallelLoopBody to core.hpp
2012-08-03 16:41:00 +04:00
Vadim Pisarevsky
fd9069422a
Merge remote-tracking branch 'origin/master'
2012-08-03 16:14:38 +04:00
yao
687d7639a8
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-03 15:44:15 +08:00
niko
3180bbe3a8
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-03 14:09:04 +08:00
niko
8eeacc8cc8
performance and bug fix for addWeighted cartToPolar div exp log resize setTo
...
add channel 3 support
add fast way Between CPU and GPU for the data which is aligned
2012-08-03 14:08:36 +08:00
Ilya Lavrenov
27c2aa3a4e
parallel version of bilateral filter was implemented using parallel_for_
2012-08-02 16:25:30 +04:00
marina.kolpakova
8d73bbb8b7
fixed 2228
2012-08-02 13:18:55 +04:00
yao
1eedcea58d
for test
...
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-02 11:34:11 +08:00
Philipp Wagner
989631c5cc
facerec.cpp: Removed Original LBP wrapper, because it is not in use and therefore generates a warning.
2012-07-31 21:54:48 +02:00
Philipp Wagner
4a4f90c406
facerec.cpp: Added an exception to the LBP extraction, so now a meaningful exception is thrown if the wrong image type was given. Thanks to Eric Christiansen for reporting.
2012-07-31 21:50:46 +02:00
Vadim Pisarevsky
fac3d9994c
integrated another portion of SSE optimizations from Grigory Frolov
2012-07-31 19:07:55 +04:00
Vadim Pisarevsky
5f2ce22fbf
Merge remote-tracking branch 'origin/master'
2012-07-31 17:18:35 +04:00
Vadim Pisarevsky
640408ebe7
added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)
2012-07-31 17:17:58 +04:00
Alexander Smorkalov
f1e3bc850b
Warning fix. ifdefs for 4.1.1 added.
2012-07-31 13:20:36 +04:00
Alexander Smorkalov
7d63f9f680
Android 4.1.1 native camera fix. BufferQueue class is used instaed of Surface texture. Includes in cmake updated.
2012-07-31 13:20:36 +04:00
Vladislav Vinogradov
b43cec3301
added gpu::graphcut for float sources (CUDA 5.0)
2012-07-31 12:46:04 +04:00
Vladislav Vinogradov
4f99f69a29
added gpu alpha premultiplication
2012-07-31 12:46:04 +04:00
Vladislav Vinogradov
79d0dc25f4
added gpu RGB<->Lab and BGR<->Luv conversions
2012-07-31 12:46:04 +04:00
Vladislav Vinogradov
051adcb786
added gpu BGR<->Lab and RGB<->Luv color conversion and gammaCorrection
2012-07-31 12:46:04 +04:00
Philipp Wagner
62a8f6783e
FaceRecognizer supports updating a model now. Documentation has been updated to reflect latest changes.
2012-07-30 19:31:10 +02:00
Vadim Pisarevsky
b9d7c712f5
made countNonZero SSE code SSE2-compliant and portable
2012-07-30 16:02:49 +04:00
niko
cf04fed369
fix the compilation bugs
2012-07-30 14:34:36 +08:00
Philipp Wagner
f29d73fe86
Updated the train method to be an InputArrayOfArrays, so the Python wrapper now generates the correct code (and it works).
2012-07-29 23:51:12 +02:00
Philipp Wagner
b2deab2175
Updated the documentation to (1) reflect the latest changes and (2) answer some questions I were asked.
2012-07-29 23:16:51 +02:00
Philipp Wagner
5983f8008f
Fixed facerec_eigenfaces.cpp demo sample: it contained hardcoded values, which made wrong element access possible. Fixed unsigned integer/signed integer warnings in facerec.cpp.
2012-07-29 22:41:40 +02:00
Philipp Wagner
f160c49473
Merge branch 'master' of git://code.opencv.org/opencv
2012-07-29 22:20:48 +02:00
Philipp Wagner
79b45b1392
Bug #2214 : Fixed bug, when calling the train method multiple times. The Eigenfaces and Fisherfaces method now re-estimate the model, the LBPH method appends the new data to the existing model.
2012-07-29 22:20:07 +02:00
Josh Doe
f1690557bf
core/stat: fix build with 32-bit
...
Optimization introduced in b782d8bb
only works for 64-bit builds, but
ifdef failed to check for this.
2012-07-29 14:48:21 -04:00
marina.kolpakova
4869e846f3
partly merged with sbromle/opencv fixes branch
2012-07-27 13:09:53 +04:00
Eric Christiansen
f08996bd37
asserted in LBPH code that images must have a single channel
2012-07-26 16:55:54 -07:00
Sam Bromley
8506ce06c1
Fix missing remainder of line.
2012-07-26 12:46:51 -02:30
Sam Bromley
fd98520d78
Protect check of CV_SSE4_2 with #if defined.
2012-07-26 12:43:56 -02:30
Sam Bromley
966a652142
Fix crash when polling for non-existent Kinects.
...
If no Kinects are present, crash can result from
stepping beyond end of device list. Now we check
to ensure this does not happen.
2012-07-26 12:36:21 -02:30
Sam Bromley
49b55a7245
Protect check for _MSC_VER with #if defined.
2012-07-26 12:35:21 -02:30
Anatoly Baksheev
acd19fe36c
test7
2012-07-25 22:20:41 +04:00
Andrey Pavlenko
de90033e93
test
2012-07-25 18:26:07 +04:00
Anatoly Baksheev
29fee9cab3
test2
2012-07-25 18:11:07 +04:00
Anatoly Baksheev
2b0c0e71bb
test
2012-07-25 18:05:39 +04:00
Maria Dimashova
a39cf2dd28
updated doc on triangulatePoints ( #2167 )
2012-07-25 17:51:37 +04:00
marina.kolpakova
e1e0c46639
integrated patch: HOG confidence calculation. Thanks, Wongun.
2012-07-25 15:26:26 +04:00
marina.kolpakova
4fa282e1a9
fixed SURf according to clockwise descriptor convention
2012-07-25 13:08:05 +04:00
marina.kolpakova
fdfa402428
fixed surf for upright case
2012-07-25 12:19:08 +04:00
Maria Dimashova
6b7470f683
fixed gcc compilation
2012-07-24 18:25:46 +04:00
Maria Dimashova
c5dbc06158
fixed bilateralFilter on uniform CV_32F image
2012-07-24 17:51:20 +04:00
Vadim Pisarevsky
b782d8bb53
integrated patch with some SSE2/SSE4.2 optimizations from Grigory Frolov
2012-07-24 17:24:31 +04:00
Maria Dimashova
54d68da8e7
fixed LshIndex types in its constructor
2012-07-24 17:09:24 +04:00
Anatoly Baksheev
1efb3c8235
test
2012-07-24 14:13:43 +04:00
marina.kolpakova
1b7ad93dc9
LBP features integrated in CascadeClassifier_GPU
2012-07-24 13:51:35 +04:00
marina.kolpakova
2dc93574e1
LBP: switched to PImpl pattern
2012-07-24 13:41:19 +04:00
marina.kolpakova
6c3eeb7d7c
removed division
2012-07-24 13:35:04 +04:00
marina.kolpakova
8fb1f4093b
removed unused code
2012-07-24 13:26:53 +04:00
Marina Kolpakova
e63ab8dec5
LBP: multiscale approach; refactored atomics usage
2012-07-17 08:27:34 +00:00
Vadim Pisarevsky
9f4efab40a
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
2012-07-16 17:08:14 +00:00
Maria Dimashova
cfeb28f2ba
fixed tests for scale invariance (uncommented sift test, it's ok now)
2012-07-16 16:21:40 +00:00
Maria Dimashova
2556bb04f0
changed tests for rotation/scale invariance of descriptors
2012-07-16 13:01:55 +00:00
Maria Dimashova
63d8eedc51
changed the way of HARRIS creation
2012-07-16 09:26:02 +00:00
Maria Dimashova
839761fa3d
fixed #2167
2012-07-16 09:00:25 +00:00
Maria Dimashova
5112d74cad
revert my incorrect fix of #2167
2012-07-16 08:02:50 +00:00
Maria Dimashova
d65920d2f7
fixed #2167
2012-07-15 19:10:52 +00:00
Maria Dimashova
ec23d9bb5e
added tests on scale invariance of detectors and descriptors
2012-07-15 17:42:41 +00:00
Marina Kolpakova
336dcbcff7
fixed brocken tests by classifier loger from r9027
2012-07-15 04:11:46 +00:00
Maria Dimashova
e4e00498a8
fixed typo in test class names
2012-07-14 20:32:31 +00:00
Maria Dimashova
0c6480d89b
added tests to check rotation invariance of descriptors (features2d and nonfree)
2012-07-14 20:03:07 +00:00
Andrey Pavlenko
4e4db94b6b
removing warnings on deprecated api when targeting to android-15+
2012-07-14 19:07:27 +00:00
Anatoly Baksheev
a2430afcac
minor LBP for GPU
2012-07-14 16:23:56 +00:00
Maria Dimashova
5120d690f0
fixed nonfree rotation invariance tests for detectors
2012-07-14 16:07:48 +00:00
Maria Dimashova
2c0455da17
changed sift angles according to KeyPoint::angle specification in r9034
2012-07-14 16:02:45 +00:00
Marina Kolpakova
b9e53ec8ea
fixed build after r9027
2012-07-14 15:50:49 +00:00
Maria Dimashova
6dc5cd15ed
specified KeyPoint::angle in rst doc and code comment
2012-07-14 15:36:35 +00:00
Anatoly Baksheev
bfe6e2c4b1
minor in LBP for GPU
2012-07-14 15:36:25 +00:00
Maria Dimashova
eb119959e8
fixed features2d rotation invariance tests
2012-07-14 15:05:41 +00:00
Maria Dimashova
c94974ccb3
fixed mser (angle is -1 now)
2012-07-14 15:03:39 +00:00
Maria Dimashova
2bd86e2541
fixed compile errors under win
2012-07-14 13:25:41 +00:00
Maria Dimashova
30c611f1d5
added tests to check rotation invariance of detectors
2012-07-13 18:03:20 +00:00
Anatoly Baksheev
9706079ace
a bit refactoring in LBP face detection on GPU
2012-07-13 15:47:09 +00:00
Maria Dimashova
722df6a998
minor change in doc
2012-07-13 06:00:30 +00:00
Maria Dimashova
438c1444eb
added test to check keypoints returned by FeatureDetector (center, size, angle)
2012-07-12 17:52:49 +00:00
Maria Dimashova
017895dd93
filtered MSER keypoints that have centers out of image
2012-07-12 17:51:12 +00:00
Vincent Rabaud
3df72fe669
fix gcc C++11 bug mentioned in http://answers.opencv.org/question/283 . Bug also fixed in FLANN upstream
2012-07-12 16:02:02 +00:00
Maria Dimashova
507f546158
split file of features2d tests
2012-07-12 13:57:17 +00:00
Maria Dimashova
d38f694275
fixed CvBoost in mll if no tree can be trained.
2012-07-12 12:29:50 +00:00
Marina Kolpakova
58c67ccfea
improved LBP indexing
2012-07-12 08:50:41 +00:00
Marina Kolpakova
965109228d
added delobal memory version
2012-07-12 08:50:36 +00:00
Marina Kolpakova
2aacff4c39
swithed to the fixed size thread block
2012-07-12 07:11:26 +00:00
Alexander Mordvintsev
c5669448a3
work on features2d python interface
2012-07-11 17:13:43 +00:00
Alexander Mordvintsev
ffd283b7d5
fixed SURF orientations, broken in r8892
...
(see also r8895, r8887 and #2043 )
2012-07-11 16:26:52 +00:00
Maria Dimashova
0b4e96d89c
updated thresholds in EM test after cv::EM fixing
2012-07-11 13:52:19 +00:00
Maria Dimashova
75e0eeab17
fixed #2160
2012-07-11 13:51:36 +00:00
Maria Dimashova
994f8710f3
fixed #2159
2012-07-11 13:26:58 +00:00
Maria Dimashova
7c211796e7
more doc details for #2152
2012-07-11 13:23:18 +00:00
Marina Kolpakova
3c2691ef96
LBP: minor changes
2012-07-11 12:22:28 +00:00
Marina Kolpakova
ed1b293d34
refactored GPU LBP cascade. Added support for big images. Fixed bug in connected components function
2012-07-11 12:22:22 +00:00
Maria Dimashova
469ec7c522
fixed vfw ( #2156 )
2012-07-11 09:04:25 +00:00
Maria Dimashova
bc3fb347a3
fixed #2155
2012-07-11 08:41:09 +00:00
Maria Dimashova
e68b26e71f
fixed doc #2152
2012-07-11 08:05:06 +00:00
Vincent Rabaud
c52d620817
update the docs for cvExtractSURF and initModule_nonfree()
2012-07-10 19:09:00 +00:00
Marina Kolpakova
86d785622b
LBP: switched to texture implementation
2012-07-10 11:58:15 +00:00
Marina Kolpakova
b0606b0557
LBP classifer moved to ptr from DevMem2D
2012-07-10 11:58:10 +00:00
Marina Kolpakova
436d2ff1fc
LBP classifer moved to ptr from DevMem2D
2012-07-10 11:58:06 +00:00
Leonid Beynenson
6d3db49932
Changed DetectionBasedTracker a bit to make its method addObject to return an integer value -- the id of the new added object.
2012-07-09 14:37:12 +00:00
Andrey Kamaev
a5b60fa532
Fixed typo in Java wrapper for FetauresDetector class
2012-07-09 10:52:28 +00:00
Andrey Kamaev
3869d38671
fixed typo in SURF detector #2149
2012-07-09 10:47:09 +00:00
Marina Kolpakova
d88bbb3d9d
fixed undefined behaviour in image codecs initialization
2012-07-08 18:26:28 +00:00
Marina Kolpakova
8c9a9f1c94
fixed documentation missmatch for ORB
2012-07-08 18:26:23 +00:00
Marina Kolpakova
33d95642d3
fixed documentation missmatch for polylines function
2012-07-08 18:26:18 +00:00
Marina Kolpakova
f094983d49
reduced the number of registers used in the LBP responce operator
2012-07-08 18:26:13 +00:00
Marina Kolpakova
09269b4cd8
fixed backward compatibility with less than 1.2 CUDA capability
2012-07-07 21:48:53 +00:00
Philipp Wagner
3ac6272c3b
Grammar and Formatting fixes. Added link to the Yale Facedatabase A. Added download directive links for linking to the sample source code samples.
2012-07-06 20:42:02 +00:00
Alexander Mordvintsev
c6705fbe20
exposed ORB features to python
2012-07-06 15:41:57 +00:00
Marina Kolpakova
66aff45e96
fixed #2130
2012-07-05 20:55:55 +00:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
2012-07-05 07:58:40 +00:00
Andrey Kamaev
b1eba01afb
Fixed several mistakes in documentation
2012-07-05 07:30:45 +00:00
Andrey Kamaev
5f8715c8b4
Fixed file globbing in documentation parsers
2012-07-05 05:11:15 +00:00
Vadim Pisarevsky
acf356b080
added contrib module support in Python wrappers (thanks to Eric Christiansen)
2012-07-04 17:59:14 +00:00
Marina Kolpakova
bc83011736
removed unnecessary memory allocation in LBP classifier
2012-07-04 16:03:48 +00:00
Marina Kolpakova
eb599f6832
added checking destination matrix size for resize and integral functions
2012-07-04 16:03:43 +00:00
Marina Kolpakova
6c0af66fd8
removed unused class filds
2012-07-04 16:03:40 +00:00
Marina Kolpakova
e496345d33
added lbp cascade test, fixed race conditions problems
2012-07-04 12:11:16 +00:00
Marina Kolpakova
248f39e13e
added performance test for LBP classifier.
2012-07-04 12:11:07 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Marina Kolpakova
4128d5782f
added hipotesis filtration
2012-07-04 04:51:09 +00:00
Marina Kolpakova
a53f0f397e
LBP classifier: tracking of count of detected objects was moved in cascadeclassifier.cpp
2012-07-04 04:51:00 +00:00
Andrey Kamaev
bd394012e8
Eliminated discrepancy between SSE and non-SSE versions of bilinear resize
2012-07-03 11:30:17 +00:00
Andrey Kamaev
aa4cad80a0
Fixed opponent space color conversion
2012-07-03 11:01:56 +00:00
Andrey Kamaev
cfc593eb0d
Fixed run.py bugs
2012-07-02 21:07:32 +00:00
Maria Dimashova
b528348f39
fixed #2118
2012-07-02 20:21:34 +00:00
Philipp Wagner
927523bc3d
Bug 2129: Fix for missing citations in FaceRecognizer documentation.
2012-07-02 18:43:20 +00:00
Andrey Kamaev
df262b340c
Fixed #2125
2012-07-02 14:20:59 +00:00
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Vadim Pisarevsky
a1bc11c429
fixed typo in minMaxIdx description (ticket #2081 )
2012-07-02 12:59:02 +00:00
Maria Dimashova
52ba2e45c4
removed obsolete parameter 'time' in regression test for descriptors
2012-07-02 12:44:41 +00:00
Maria Dimashova
9cd0c9033f
fixed angles of SURF detector
2012-07-02 12:32:14 +00:00
Andrey Kamaev
565a8dc30d
Fixed automatic temporary files cleaning with run.py on Windows
2012-07-02 12:23:57 +00:00
Maria Dimashova
ad6929b6a4
removed y-axis inversion in drawKeypoints (FeatureDetector has to do this)
2012-07-02 12:04:00 +00:00
Maria Dimashova
0f21890d7d
added test for opponent descriptor extractor
2012-07-02 11:58:17 +00:00
Andrey Pavlenko
600ad799c7
restoring binary compatibility with 2.4.1
2012-07-02 11:54:24 +00:00
Andrey Kamaev
5d6c90e166
Fixed bugs in facerec documentation
2012-07-02 11:46:17 +00:00
Marina Kolpakova
76354287aa
fixed build without CUDA
2012-07-02 10:54:05 +00:00
Alexander Smorkalov
c80d205ecf
OpenCV Library renamed.
2012-07-02 10:07:24 +00:00
Marina Kolpakova
319c20c797
result storing: atomic based
2012-07-02 08:08:17 +00:00
Marina Kolpakova
a9f2f522e7
LBP classifier was refactored, added parameter for max size of detected object
2012-07-02 08:08:11 +00:00
Marina Kolpakova
e6f7e4d83e
GPU resize became same as CPU implementation
2012-07-02 08:08:02 +00:00
Marina Kolpakova
60b73e7471
gpu classifier default values became same as to cpu implementation
2012-07-02 08:07:55 +00:00
Marina Kolpakova
e7f5978768
classifier loading has been improved
2012-07-02 08:07:46 +00:00
Maria Dimashova
6042c59495
fixed #1764
2012-07-01 22:40:25 +00:00
Vadim Pisarevsky
31395b0759
added check for false bug report #2081
2012-07-01 21:29:50 +00:00
Vadim Pisarevsky
562838e0b5
partial fix for repeated algorithm registration (patch #2101 by Stephan Reuter)
2012-07-01 21:14:16 +00:00
Maria Dimashova
d56b771963
fixed #2082
2012-07-01 20:59:29 +00:00
Maria Dimashova
8f5b15b1c3
fixed compilation in msvc
2012-07-01 20:58:08 +00:00
Vadim Pisarevsky
e918877bcf
fixed bug with uninitialized variable in cvGetOptimalNewCameraMatrix (patch #1731 by floemker)
2012-07-01 20:56:27 +00:00
Vadim Pisarevsky
7ef2114107
added fullscreen mode on Mac (patch #2040 by Takahiro Horikawa)
2012-07-01 20:25:24 +00:00
Vadim Pisarevsky
b5eb318ae3
added support of homogeneous points to calcCorrespondEpilines (ticket #2055 )
2012-07-01 20:13:49 +00:00
Andrey Kamaev
dec38e5949
Background subtractor GMG: removed flexitype, fixed build errors.
2012-06-30 20:47:09 +00:00
Andrey Kamaev
afe11f69fb
Fixed Windows build warnings and configuration problem.
2012-06-30 20:45:01 +00:00
Andrey Kamaev
27c23b557c
Merged few small fixes from 2.4 branch
2012-06-30 13:36:27 +00:00
Marina Kolpakova
cdad4ac7c9
Merge branch 'home'
2012-06-30 09:29:33 +00:00
Leonid Beynenson
6d3fecd490
Fixed small bug in cv::Ptr<_Tp> conversion to cv::Ptr<_Tp2>. Now this conversion is made in a more accurate way.
2012-06-29 16:38:03 +00:00
Andrey Pavlenko
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
2012-06-29 15:38:10 +00:00
Andrey Kamaev
2b6b6f12e2
Debug message is turned off
2012-06-29 08:47:38 +00:00
Andrey Kamaev
0584ac525b
Quiet MSER tests
2012-06-29 08:34:07 +00:00
Andrey Kamaev
71729a5967
opencv_ts is removed for java API
2012-06-29 08:11:20 +00:00
Andrey Kamaev
4d09d62f85
Added Ptr<T> support to AlgorithmInfo; fixed some warnings
2012-06-29 07:46:53 +00:00
Andrey Kamaev
a25c27ca05
Fixed windows build problems of BackgroundSubtractorGMG but code still need more work.
2012-06-28 20:42:26 +00:00
Vadim Pisarevsky
82cb2ab556
fixed bug in SVD, ticket #2027 ; fixed building highgui with ffmpeg support on MacOSX
2012-06-28 19:45:13 +00:00
Andrey Kamaev
5a2ba94dd6
Fixing parallel build for Android
2012-06-28 19:30:39 +00:00
Andrey Kamaev
2a2092092f
Fixed Android build warnings in backgroundsubtractor_gbh
2012-06-28 18:11:10 +00:00
Vadim Pisarevsky
7c778fc043
fixed possible video distortion problem when cap_avfoundation.mm is used to capture video (ticket #1980 )
2012-06-28 16:34:53 +00:00
Vadim Pisarevsky
e4b58ebff5
added GMG background segmentation algorithm by Andrew Godbehere, ticket #2065
2012-06-28 16:24:48 +00:00
Leonid Beynenson
35344569bf
Added possibility in the class DetectionBasedTracker to work as a tracker only -- without the mainDetector.
...
In this case new objects will be added into it by the method addObject(const cv::Rect& location).
2012-06-28 16:07:10 +00:00
Vadim Pisarevsky
fd901d8323
fixed #2108 (thanks to Vincent for the report and proposed solution)
2012-06-28 15:52:34 +00:00
Andrey Kamaev
6a13c9efc0
Added cmake for building Android package
2012-06-28 13:42:08 +00:00
Leonid Beynenson
d822989c8b
Added template method cv::Algorithm::set(const char* _name, const Ptr<_Tp>& value),
...
which allows to pass as the second parameter of the method set any cv::Ptr<_Tp> object.
2012-06-28 12:17:11 +00:00
Andrey Kamaev
e4965b143f
Fixed discrepancy between SSE and regular baranches in FREAK
2012-06-28 11:08:11 +00:00
Andrey Kamaev
739da31add
Fixed Android build with SDK tools revision 20
2012-06-28 11:06:31 +00:00
Andrey Kamaev
e8b0d27942
Fixed cvExtractSURF in case of no keypoints found #2076
2012-06-28 05:59:30 +00:00
Vadim Pisarevsky
d60b1f2f82
fixed bug #2106 ; added test
2012-06-27 20:51:48 +00:00
Vadim Pisarevsky
73ce3ef8c1
fixed ios framework build (ticket #2092 )
2012-06-27 19:52:59 +00:00
Philipp Wagner
ea0b57cc23
API Link corrected.
2012-06-27 18:37:03 +00:00
Philipp Wagner
d636c677f4
API Link corrected.
2012-06-27 18:35:52 +00:00
Andrey Kamaev
6c3137a8b5
Fixed divide by zero problem in cvStereoRectify (thanks to Philip Van Valkenberg) #2099
2012-06-27 15:15:32 +00:00
Andrey Kamaev
f09ae32796
Fixed Mat::isContinuous for big matrix (thanks to Boris Mansencal) #2103
2012-06-27 14:19:35 +00:00
Andrey Kamaev
15e50420bc
Fixed linux and android install
2012-06-27 13:52:29 +00:00
Andrey Pavlenko
8b67adea98
workarounding missing native part in Java tests
2012-06-27 12:38:57 +00:00
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
Andrey Kamaev
abde1377f3
Fixed mistake in documentation
2012-06-27 09:20:02 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Philipp Wagner
f2e78eed8c
Fixed wrong restructured text directive, when referencing to other documents.
2012-06-26 21:24:19 +00:00
Andrey Kamaev
69b5972e03
Fixed MSVC build with Qt enabled #2096
2012-06-26 21:05:15 +00:00
Philipp Wagner
a15d97b716
Added the cv::FaceRecognizer documentation (API, Face Recognition Guide, Tutorials).
2012-06-26 20:13:11 +00:00
Andrey Pavlenko
9efc1a689b
fixing project properties
2012-06-26 15:25:00 +00:00
Andrey Pavlenko
ac6061ee8a
hiding extra build-time messages
2012-06-26 13:42:10 +00:00
Marina Kolpakova
bd500ff0f7
fixed LBP loader test
2012-06-26 12:44:27 +00:00
Vladislav Vinogradov
e7c35b1852
fixed bug in cv::gpu::HOGDescriptor::detectMultiScale
2012-06-26 12:24:48 +00:00
Marina Kolpakova
a743eca076
LBP features: GPU representation
2012-06-26 12:15:19 +00:00
Andrey Kamaev
55567582a6
added XIMEA support for linux (by Igor Kuzmin) #2085
2012-06-26 11:48:58 +00:00
Andrey Kamaev
f9418853a0
Applied XIMEA path (by Marian Zajko) with multiple changes #2054
2012-06-26 11:47:49 +00:00
Vladislav Vinogradov
e9e66e5796
added VIBE_GPU (background subtraction) to gpu module
2012-06-26 10:38:15 +00:00
Andrey Kamaev
0f8e271509
Fixing iOS detection in core persistence
2012-06-26 09:21:22 +00:00
Andrey Kamaev
dd7eeea118
Fixing cv::tempfile on Windows #2093
2012-06-26 09:07:37 +00:00
Andrey Kamaev
ecf6b5a87c
Making all dependencies from highgui module optional
2012-06-26 07:29:36 +00:00
Alexander Smorkalov
80febef237
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
2012-06-25 17:01:55 +00:00
Marina Kolpakova
915c81febf
fixed build without CUDA
2012-06-25 16:52:54 +00:00
Marina Kolpakova
6801f475ad
LBP: implemented first version of device side part
2012-06-25 16:39:50 +00:00
Marina Kolpakova
71f94e12fb
LBP: implemented image data preparing
2012-06-25 16:39:45 +00:00
Marina Kolpakova
91ba48c5f9
added lbp related CUDA files
2012-06-25 16:39:40 +00:00
Marina Kolpakova
e637168e44
completed test: load LBP classifier
2012-06-25 16:39:34 +00:00
Marina Kolpakova
143c57064b
LBP classifier represintation in GPU memory
2012-06-25 16:39:29 +00:00
Vladislav Vinogradov
4ee236b1b6
added docs for MOG_GPU and MOG2_GPU
2012-06-25 13:19:55 +00:00
Andrey Kamaev
7b806f6008
fixed several documentation errors
2012-06-25 12:56:46 +00:00
Vladislav Vinogradov
d85ef03a42
added background subtraction sample for gpu module
2012-06-25 12:48:54 +00:00
Andrey Kamaev
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
Andrey Kamaev
ec3a7665b0
Fixed FREAK on Android
2012-06-25 11:19:11 +00:00
Vladislav Vinogradov
acc031aaba
added MOG_GPU and MOG2_GPU (Gaussian Mixture background subtraction)
2012-06-25 11:13:50 +00:00
Marina Kolpakova
5f6bbcc89a
added test for GPU LBP cascade: load cascade
2012-06-25 08:46:34 +00:00
Andrey Kamaev
1ee5c95ee9
Updated gtest to upstream rev616
2012-06-24 18:25:58 +00:00
Andrey Kamaev
84d62b69dc
Fixed windows build of FREAK
2012-06-24 14:33:30 +00:00
Andrey Kamaev
bd901eb52d
Reverted r8721 and r8725 (issue #2080 )
2012-06-24 08:50:03 +00:00
Vadim Pisarevsky
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
Andrey Kamaev
a381b95e91
Fixed buggy NEON check inside flann
2012-06-22 16:10:43 +00:00
Andrey Pavlenko
cc54226e12
updating version
2012-06-22 15:19:03 +00:00
Andrey Pavlenko
cf88b9d00c
workarounding service-related changes
2012-06-22 15:18:06 +00:00
Vadim Pisarevsky
87d1731714
added synonym CV_COMP_HELLIGNER for CV_COMP_BHATTACHARYAA to reflect the real formula used (bug report #2073 )
2012-06-22 15:12:19 +00:00
Marina Kolpakova
1365e28a54
initial support of GPU LBP classifier: added new style xml format loading
2012-06-22 15:00:36 +00:00
Vadim Pisarevsky
0c65ea976a
added the optional output maxima value to phaseCorrelate (patch #2071 by Robert Huitl)
2012-06-22 13:34:03 +00:00
Andrey Kamaev
511d09f587
Fixed tests broken by r8708
2012-06-22 08:36:29 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Alexander Smorkalov
a3be73b5cc
revisions 8681 and 8688 restored. Warning fixed.
...
Warning: changes beak binary compatibility
2012-06-21 14:37:28 +00:00
Andrey Kamaev
5e0160d711
Fixed few warnings on Linux
2012-06-21 12:44:48 +00:00
Andrey Pavlenko
952b25f86f
changing 'java' module layout
2012-06-21 11:44:31 +00:00
Andrey Kamaev
25f70e691a
Fixed warnigs from zlib defines
2012-06-21 10:28:57 +00:00
Andrey Pavlenko
3af92a9d92
fixing warnings
2012-06-21 09:14:14 +00:00
Marina Kolpakova
b065c7a296
fixes for the newly added gcc warning keys
2012-06-21 03:48:36 +00:00
Andrey Kamaev
f6ef504ef0
Fixed few more warnings/bugs.
2012-06-20 21:09:27 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Pavlenko
779f4e39de
adding JNI func-s declarations to eliminate build warnings inside Android tree
2012-06-20 08:58:30 +00:00
Andrey Pavlenko
2c786a47d0
fix for #2048 (artificial 'delete' method had wrong JNI signature)
2012-06-20 08:28:43 +00:00
Andrey Pavlenko
dc93c21962
fix for #2063 ( Mat(Mat m, Rect roi) returns wrong sub-mat)
2012-06-20 07:43:01 +00:00
Marina Kolpakova
43f2682e15
fixed build without CUDA
2012-06-20 07:30:19 +00:00
Marina Kolpakova
e7f6c4b7ef
scan operations are moved in separate header
2012-06-20 05:41:16 +00:00
Marina Kolpakova
6620c5c92d
Merge branch 'work'
2012-06-19 13:41:15 +00:00