Andrey Kamaev
0cf9c16adc
Merge pull request #478 from jet47:gpu-reduction-fix
2013-02-12 17:06:07 +04:00
Andrey Kamaev
7c77b402db
Merge pull request #468 from kirill-kornyakov:test-for-saturate-cast
2013-02-12 17:04:54 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Ilya Lavrenov
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Vladislav Vinogradov
fdb07a0ac1
fix performance issue of gpu reduction
2013-02-12 09:50:41 +04:00
Vadim Pisarevsky
06f4a56469
converted flood fill, getrectsubpix & cornersubpix to C++
2013-02-11 23:49:10 +04:00
Andrey Kamaev
b6e7aeabe0
Merge pull request #476 from apavlenko:eclipse_import_fix
2013-02-11 21:38:07 +04:00
Andrey Kamaev
3990564a83
Merge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column
2013-02-11 21:16:39 +04:00
Andrey Kamaev
2495b23a7d
Merge pull request #473 from prclibo:2.4
2013-02-11 20:48:03 +04:00
Andrey Kamaev
059ea5bebe
Merge pull request #471 from apavlenko:jar_install
2013-02-11 20:46:48 +04:00
Andrey Pavlenko
54bcaa4934
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu
2013-02-11 19:49:18 +04:00
Bo Li
92e7e7d8e8
fix issue 2788
2013-02-11 15:09:42 +01:00
Kirill Kornyakov
74e5650350
Reenabled second test
2013-02-11 16:53:41 +04:00
Andrey Kamaev
5cae645ba1
Temporary disabled parallel_writers_and_readers test
2013-02-11 16:52:20 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Kirill Kornyakov
7071bd63ab
Added two tests to highlight bug #2788
2013-02-11 15:25:15 +04:00
Kirill Kornyakov
81b9f9b16b
Added a test that documents that negative numbers are not clipped by cv::saturate_cast
2013-02-11 14:58:38 +04:00
Andrey Kamaev
1869f77c0f
Merge pull request #457 from taka-no-me:fix_vars_expansion
2013-02-11 14:37:14 +04:00
Andrey Kamaev
ffb3b5ddbe
Adjust OpenCV version to 2.4.4
2013-02-11 14:17:29 +04:00
Andrey Kamaev
2ed6bc8aaf
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
...
This reverts commit 4abf0b3193
.
Changes are reverted because they break build of proxy dlls on Windows
2013-02-11 14:15:29 +04:00
Andrey Kamaev
9d7300f003
Merge pull request #465 from asmorkalov:android_camera_connect
2013-02-11 14:05:37 +04:00
Andrey Kamaev
5335c2f920
Merge pull request #464 from asmaloney:missing_fclose
2013-02-11 14:03:51 +04:00
Andrey Kamaev
2a98c1f89c
Merge pull request #446 from AnnaKogan8:updated-perf-timing-script
2013-02-11 14:02:39 +04:00
Alexander Smorkalov
283b26e2db
Issue in NativeCameraView and JavaCameraView fixed.
...
In previous version getWidth() and getHeight() values were used instead method parameters.
2013-02-11 09:43:44 +04:00
Andy Maloney
2075236757
If generating a bin file (second half of conditional), make sure the file is closed
...
(Also fix spelling in comment)
2013-02-10 21:55:20 -05:00
Andrey Kamaev
716e0192b3
Merge pull request #456 from vpisarev:python_ptseq_fix
2013-02-08 18:52:04 +04:00
Andrey Kamaev
3ed6c09485
Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate
2013-02-08 18:48:37 +04:00
Andrey Kamaev
504264ab7b
Merge pull request #402 from asmorkalov:samples_data_rase_fix
2013-02-08 18:48:13 +04:00
Andrey Kamaev
46ca5c32cd
Merge pull request #455 from AlexeySpizhevoy:2.4
2013-02-08 18:45:24 +04:00
Andrey Kamaev
4f4fe553bc
Merge pull request #450 from bitwangyaoyao:2.4_dft
2013-02-08 18:43:34 +04:00
Andrey Kamaev
571665b559
Fix CMake variables substitution in Android project files
2013-02-08 18:21:49 +04:00
Vadim Pisarevsky
43d61d961e
fixed problem with Nx2 numpy arrays in geometrical functions ( #2783 )
2013-02-08 18:11:56 +04:00
Alexey Spizhevoy
e0ead7b606
fixed assertion failure (vector out of range) for the 'vc10,debug' build ( #2775 )
2013-02-08 17:44:57 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
yao
0b365f6aa5
add +-*/ operators to oclMat
2013-02-08 11:41:46 +08:00
yao
4d6827212d
some bugs fix in using AmdFft library
2013-02-08 10:46:43 +08:00
Anatoly Baksheev
79d5724794
BP doc change according to Adrian's request (OpenCV book co-author)
2013-02-07 22:31:39 +04:00
Anna Kogan
51e58aeb25
Added --failed-only option and multiple input files support
2013-02-07 19:08:31 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
Andrey Kamaev
93d4abecf8
Merge pull request #443 from taka-no-me:fix_cascade_test
2013-02-06 16:40:38 +04:00
Andrey Kamaev
37d695a62e
Use gtest assertions in cascade test
...
This simplifies test debugging a lot
2013-02-06 15:07:31 +04:00
Vladislav Vinogradov
bb3b1441c5
added 8u type support to filterSpeckles function
2013-02-06 14:14:45 +04:00
Andrey Kamaev
bf575ba7fb
Merge pull request #434 from taka-no-me:fix_parallel_writer_test
2013-02-06 14:04:59 +04:00
Andrey Kamaev
7cdede0c55
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
2013-02-06 14:04:28 +04:00
yao
e31e924cf7
remove the warnings in accuracy test
2013-02-06 09:12:40 +08:00
Andrey Kamaev
fe0516c877
Merge pull request #432 from bitwangyaoyao:2.4_blend
2013-02-05 14:53:49 +04:00
Andrey Kamaev
53e77ed468
Merge pull request #431 from snosov1:matchTemplate-tegra
2013-02-05 14:50:15 +04:00
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