yao
568b935246
remove a warning on Linux
...
fix a error in doc
2013-02-05 17:16:40 +08:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
f608df9640
Merge pull request #427 from vrabaud:brisk_fixes_2.4
2013-02-04 17:10:02 +04:00
Sergei Nosov
c0e3d48ebc
stricter eps for normed methods
2013-02-04 16:02:01 +04:00
Andrey Kamaev
4d785fff99
Merge pull request #409 from asmorkalov:giganetix_cams_patch_master
2013-02-04 14:57:14 +04:00
Andrey Kamaev
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
Andrey Kamaev
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
Vincent Rabaud
d235c3a678
define the default remapping in the right scope
2013-02-04 11:08:00 +01:00
Vincent Rabaud
0b1599d88a
write documentation for BRISK
2013-02-04 11:07:53 +01:00
yao
9711ef6dee
blend use vector to optimize
2013-02-04 17:29:20 +08:00
Sergei Nosov
15d0484485
matchTemplate perf tests added
2013-02-04 12:57:22 +04:00
Sergei Nosov
c768731e89
enable Tegra optimizations
2013-02-04 12:57:03 +04:00
Andrey Kamaev
9c939a8dcf
Merge pull request #420 from asmaloney:check-mem-alloc
2013-02-04 12:56:36 +04:00
Andrey Kamaev
5a767863bd
Merge pull request #413 from berak:master
2013-02-04 12:56:12 +04:00
Andrey Kamaev
650609aaeb
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx
2013-02-04 12:03:24 +04:00
Andrey Kamaev
6dc3b662f6
Merge pull request #425 from asmaloney:vector_empty
2013-02-04 12:03:03 +04:00
Andrey Kamaev
58c4d5f4b4
Merge pull request #424 from asmaloney:additional-checks
2013-02-04 12:02:43 +04:00
Andrey Kamaev
fc4a2244fa
Merge pull request #421 from asmaloney:check-mem-alloc2
2013-02-04 12:02:28 +04:00
Andrey Kamaev
37460acb21
Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps
2013-02-04 11:57:33 +04:00
Andrey Kamaev
e2536f1c35
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
2013-02-04 11:54:43 +04:00
yao
a639a1ae5c
add setDeviceEx interface
...
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
yao
3c5cb4931e
simplify the kernel logic when using rect kernel or without ROI
2013-02-04 13:33:27 +08:00
marina.kolpakova
7c98735c0d
add compute capability check
2013-02-03 22:44:13 +04:00
Andy Maloney
ac8744af6a
No need to check vector size before clear()
2013-02-02 19:00:41 -05:00
Andy Maloney
c8cad0857e
Remove unused constructor
...
Add checks for valid values
Fix wording on some errors
2013-02-02 16:09:10 -05:00
Andy Maloney
b79e8053c1
Check memory allocation
...
Declare vars as locally as possible
2013-02-02 08:44:25 -05:00
Andy Maloney
b497380a68
Check memory allocation
...
Initialize local variables
2013-02-02 08:33:40 -05:00
Andrey Kamaev
2a669555de
Merge pull request #414 from asmaloney:remove-unused-vars2
2013-02-02 14:34:47 +04:00
Andy Maloney
3154cdf8ac
Fix subtle bug when src & dst agree on sparsity but have different dimensions
...
Remove unused var "total"
Declare vars as locally as possible
2013-02-01 22:57:22 -05:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05:00
berak
baf2b87a0d
Update modules/contrib/include/opencv2/contrib/contrib.hpp
...
class LevMarqSparse is not tagged CV_EXPORTS,
so the contrib module, built the on win using vs won't contain that symbol,
trying to create an instance of LevMarqSparse will lead to a 'undefined symbol' err, because it did not make it into the library.
2013-02-01 21:13:55 +01:00
cuda-geek
f52ce6529b
Merge pull request #322 from cuda-geek:training
2013-02-01 18:45:12 +04:00
Andrey Kamaev
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
cuda-geek
db9de43fa5
Merge pull request #407 from taka-no-me:fix_java_after_surf_change
2013-02-01 17:48:21 +04:00
marina.kolpakova
cc538ddfa6
changes related with code review
2013-02-01 17:47:05 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
LeonidBeynenson
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +04:00
Alexander Smorkalov
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
LeonidBeynenson
013d54c230
Changed types of some variables from int64 back to int.
...
Also corrected some indexes to be size_t.
2013-02-01 14:41:14 +04:00
marina.kolpakova
f7ac73998a
code review fixes
2013-02-01 14:36:06 +04:00
marina.kolpakova
14ac8a528e
final refactoring and test for training
2013-02-01 14:36:06 +04:00
marina.kolpakova
d314c602d5
add documentation for new classes
2013-02-01 14:36:06 +04:00
marina.kolpakova
1613aa45bc
fix python bindings
2013-02-01 14:36:06 +04:00
marina.kolpakova
fa15fcc53e
move feature pool to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
0b039f3c6b
refactor feature pool
2013-02-01 14:36:06 +04:00
marina.kolpakova
b4aa33b6d3
move ICF -> ChannelFeature
2013-02-01 14:36:06 +04:00
marina.kolpakova
a01f596474
update documentation for softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
7f80054dfd
move miscellaneous python scripts to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
4ba8b53152
split public interface and realization for SoftCascadeOctave
2013-02-01 14:36:06 +04:00
marina.kolpakova
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
2013-02-01 14:36:06 +04:00
marina.kolpakova
49ec664238
add IntegralChannelComputer
2013-02-01 14:36:05 +04:00
marina.kolpakova
716a9ccb71
move training to softcascade module
...
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
marina.kolpakova
61441a1014
rename SCascade -> SoftCascadeDetector
2013-02-01 14:36:05 +04:00
marina.kolpakova
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
marina.kolpakova
decb137185
use long seeds only for 64 bit systems
2013-02-01 14:35:29 +04:00
marina.kolpakova
b0905c67ba
minor
2013-02-01 14:35:28 +04:00
marina.kolpakova
16aacf1780
use long seeds
2013-02-01 14:35:27 +04:00
marina.kolpakova
e903ce10ce
fix wartings for 32bit build
2013-02-01 14:35:27 +04:00
marina.kolpakova
a28f5a89b3
move preprocessor to objdetect
2013-02-01 14:35:27 +04:00
marina.kolpakova
8672ae58e2
fix globbing under win
2013-02-01 14:34:40 +04:00
marina.kolpakova
e2de3b0b81
fix build inder mac
2013-02-01 14:34:40 +04:00
marina.kolpakova
dc12b4476a
suppress debug out for soft cascade Octave
2013-02-01 14:34:40 +04:00
marina.kolpakova
e35eebd4d4
fix android build
2013-02-01 14:34:40 +04:00
marina.kolpakova
e47f58f4ce
replace Mats to Input/OutputArrays for Octave's public interface
2013-02-01 14:34:40 +04:00
marina.kolpakova
e7bab669fa
replace cv::Mat to Input/Output arrays
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0f2203f22
raplase error output on CV_Error
2013-02-01 14:34:40 +04:00
marina.kolpakova
dd8de0c41f
move soft cascade octave to ml module
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0e93d0482
move image extraction logic from Octave to Dataset class
2013-02-01 14:34:40 +04:00
marina.kolpakova
a3600b94db
created abstract FeaturePool class
2013-02-01 14:34:40 +04:00
marina.kolpakova
d4d47b1e58
restore backword compatibility
2013-02-01 14:34:39 +04:00
marina.kolpakova
a8d0e04912
amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade"
2013-02-01 14:34:39 +04:00
Vadim Pisarevsky
51eba617a8
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
2013-02-01 14:01:44 +04:00
Andrey Kamaev
b179e2dd2d
Merge pull request #396 from vpisarev:facedetect_fixes
2013-02-01 12:49:48 +04:00
Andrey Kamaev
992d47e9dc
Merge pull request #400 from ilysenkov:bugfix_2560
2013-02-01 12:05:48 +04:00
Andrey Kamaev
5ef58a474a
Merge pull request #397 from ilysenkov:bugfix_2677
2013-02-01 12:04:38 +04:00
Andrey Kamaev
0b6677f6d3
Merge pull request #398 from ilysenkov:bugfix_2330
2013-02-01 11:19:33 +04:00
Vadim Pisarevsky
638c0d1bf4
fixed compile warnings
2013-02-01 10:47:27 +04:00
Andrey Kamaev
57aa089ad6
Merge pull request #392 from vpisarev:python_fixes2
2013-02-01 10:20:52 +04:00
Ilya Lysenkov
b24e4bddb1
Documented the TermCriteria class ( #2560 )
2013-02-01 10:16:30 +04:00
Ilya Lysenkov
7745c8806c
Added info() method in descriptor matchers ( #2330 )
2013-02-01 02:23:40 +04:00
Ilya Lysenkov
098ea6fcb7
Checked key_size in LSH table for validness ( #2677 )
2013-01-31 23:19:19 +04:00
Ilya Lysenkov
1becbd9fcc
Added a test for invalid key sizes in LSH tables
2013-01-31 23:17:07 +04:00
Vadim Pisarevsky
50299c1d5e
disabled the use of SSE4 instructions as well to make the code compatible with the old Intel and AMD chips
2013-01-31 22:57:46 +04:00
Vadim Pisarevsky
18039d7829
added test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp. it should cover tickets #2534 , #2591 , #2669
2013-01-31 22:55:04 +04:00
Andrey Kamaev
39b4bf1828
Merge pull request #390 from taka-no-me:fix_relative_error_check
2013-01-31 21:32:45 +04:00
Andrey Kamaev
a8c014de33
Merge pull request #318 from AnnaKogan8:fixed-perf-tests
2013-01-31 21:01:44 +04:00
Andrey Kamaev
13d2412d24
Merge pull request #394 from taka-no-me:fix_tiff_test
2013-01-31 20:52:35 +04:00
Andrey Kamaev
34ef209940
Merge pull request #393 from Daniil-Osokin:bugfix_doc_multi_issues
2013-01-31 20:30:33 +04:00
Vadim Pisarevsky
54e0765d80
yet another minor fix in cv::transpose()
2013-01-31 20:26:16 +04:00
cuda-geek
d874d93e24
Merge pull request #372 from cuda-geek:gpu-cascade-fixes
2013-01-31 20:13:31 +04:00
Vadim Pisarevsky
7ca38d63d9
fixed failure of the C++ test for estimateAffine3D
2013-01-31 19:44:16 +04:00
LeonidBeynenson
6de422701a
Made changes to allow ml module to work with big data.
2013-01-31 19:37:20 +04:00
Andrey Kamaev
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Vadim Pisarevsky
79e278c008
applied patch #2587
2013-01-31 16:19:20 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Vadim Pisarevsky
82b6419d12
added tests for fast (ticket #2613 ) and estimateAffine3D ( #2375 )
2013-01-31 16:15:40 +04:00
Andrey Kamaev
e3b45910aa
Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test
2013-01-31 16:06:22 +04:00
Andrey Kamaev
e63b4591ff
Suppress clang build warning
2013-01-31 16:01:04 +04:00
Andrey Kamaev
4f1913ed26
Correct tolerance value for sanity checks with ERROR_RELATIVE
...
Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.
2013-01-31 15:47:14 +04:00
Vadim Pisarevsky
abd9675a99
fixed bugs #1718 , #2375 ; attached the new tests to test.py.
2013-01-31 15:34:09 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
cuda-geek
53b0df87f1
Merge pull request #385 from etalanin:bug2607
2013-01-31 13:46:01 +04:00
cuda-geek
bf53ebd590
Merge pull request #381 from vpisarev:surf_fixes
2013-01-31 13:36:10 +04:00
cuda-geek
fe30da6e2c
Merge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion
2013-01-31 13:26:26 +04:00
Andrey Kamaev
fda32d3d8d
Merge pull request #382 from cuda-geek:fix-broken-links-bug-2689
2013-01-31 13:08:01 +04:00
Evgeny Talanin
50c2f87add
Fix and test for #2607
2013-01-31 12:23:08 +04:00
cuda-geek
f3ae185fd0
Merge pull request #383 from cuda-geek:apply-opencv-macosx-patch
2013-01-31 12:04:13 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
e0426148ba
Merge pull request #374 from ivan-korolev:fix_estimateRigidTransform
2013-01-30 20:26:54 +04:00
marina.kolpakova
8b3c717e8f
apply patch #2686
2013-01-30 20:20:06 +04:00
cuda-geek
e72c7736e7
Merge pull request #375 from taka-no-me:fix_opticalflow_2075
2013-01-30 20:18:53 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
33c26a93c6
Merge pull request #376 from taka-no-me:solve_tiff_conflict
2013-01-30 19:36:09 +04:00
marina.kolpakova
5b03d47fb8
fix broken links in cascade classification documentation
2013-01-30 19:28:16 +04:00
cuda-geek
bc53a054f2
Merge pull request #380 from asmorkalov:java_test_fix2
2013-01-30 19:03:35 +04:00
cuda-geek
31d3c508db
Merge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build
2013-01-30 18:59:56 +04:00
Vadim Pisarevsky
1f261c2f9d
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.
2013-01-30 18:07:37 +04:00
Alexander Smorkalov
5bc6365ba5
TestCheckVector java test fixed. Warning fixed.
2013-01-30 17:28:22 +04:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Andrey Kamaev
11871528ce
Solve conflict between tiff.h and opencv2/core/types_c.h
...
Сonflict exists between some versions of libtiff and opencv headers
2013-01-30 16:36:50 +04:00
Andrey Kamaev
c9d8e9900f
Allow input of calcOpticalFlowPyrLK be submats of different size images
...
This fixes bug #2075
2013-01-30 16:07:55 +04:00
Andrey Kamaev
6a29b13c45
Add test for issue #2075
2013-01-30 16:07:38 +04:00
marina.kolpakova
cb329400df
fix tests
2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690
integrate new cascade format to GPU soft cascade implementation
2013-01-30 15:55:04 +04:00
Ivan Korolev
b362affd13
Fixed bug in the cv::estimateRigidTransform ( #1949 )
2013-01-30 15:27:23 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +04:00
Ilya Lysenkov
56fbcc541f
Tested cvDestroyAllWindows() without windows
2013-01-30 15:25:10 +04:00
Andrey Kamaev
3a55fb9d1b
Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault
2013-01-30 15:16:30 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
52b32ba8f0
Merge pull request #371 from taka-no-me:fix_build
2013-01-30 15:06:19 +04:00
Andrey Kamaev
b6de1fccc3
Merge pull request #370 from ilysenkov:bugfix_1747
2013-01-30 14:42:10 +04:00
Andrey Kamaev
62b9180c50
Merge pull request #368 from ilysenkov:checkSubset-fix
2013-01-30 14:41:37 +04:00
Andrey Kamaev
81f5e72630
Merge pull request #366 from asmorkalov:gstreamer_codec_list
2013-01-30 14:41:22 +04:00
Andrey Kamaev
8d9af7de61
Merge pull request #362 from Daniil-Osokin:bugfix_doc_StereoSGBM
2013-01-30 14:41:06 +04:00
Andrey Kamaev
ae7460440e
Merge pull request #361 from taka-no-me:tiff_big_tile
2013-01-30 14:40:51 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Andrey Kamaev
e79e81c6cd
Fix Windows build warnings
2013-01-30 13:24:49 +04:00
Ilya Lysenkov
6feade3110
Added support of different resolution in rectify3Collinear
2013-01-30 13:19:12 +04:00
Andrey Kamaev
eeb865ee8a
Fix Android build warnings
2013-01-30 13:11:33 +04:00
Ilya Lysenkov
9ce2197e9d
Added processing of trivial subsets
2013-01-30 13:03:03 +04:00
Alexander Smorkalov
82e325cbfa
Patch #2721 More FourCC for gstreamer applied.
2013-01-30 11:44:14 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Daniil Osokin
f9de98ec64
Fixed proposed values for speckleRange in StereoSGBM docs (bug #1937 )
2013-01-30 09:02:17 +04:00
Andrey Kamaev
62ce815197
Fix rollover when computing buffer size in tiff decoder (bug #2161 )
2013-01-30 00:07:33 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
