Markus Schoeler
ddb0afbc44
Changed line 1266 in svm.cpp to allow the new kernels to be used
2013-02-14 15:28:10 +01:00
Markus Schoeler
7cab6798c0
Added two kernels to existing SVM framework
...
Histogram intersection kernel (accessible by using SVM::INTER in CV namespace as kernel_type)
Exponetial chi2 kernel (accessible by using SVM::CHI2 in CV namespace as kernel_type)
Formulars:
Exp-CHI2
k(x,y) = exp(-gamma * CHI2(x,y))
CHI2(x,y) = 1- 2* SUM_i[(xi-yi)²/(xi+yi)]
Intersec
k(x,y) = SUM_i[min(xi,yi)]
2013-02-14 11:30:30 +01:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
ca5e6f9522
Merge pull request #480 from taka-no-me:ffmpeg_warnings
2013-02-12 20:29:03 +04:00
Andrey Kamaev
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04:00
Andrey Kamaev
8b7a28a7e4
Merge pull request #477 from asmorkalov:android_version_info
2013-02-12 17:06:27 +04:00
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
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
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
Andrey Kamaev
80d760c96e
Merge pull request #467 from asmorkalov:manager_jni_overflow
2013-02-11 19:17:41 +04:00
Andrey Kamaev
a370404d9c
Merge pull request #416 from asmaloney:mat-docs-cleanup
2013-02-11 18:51:03 +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
Alexander Smorkalov
9f9c333a26
Bug #2759 android.os.DeadObjectException on OpenCV Manager connection fixed.
...
DeleteLocalRef calls for jclass objects added.
2013-02-11 16:03: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 4abf0b31936c96887c028d799c6e89edfc4e197b.
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
c61d7088ae
Merge pull request #466 from taka-no-me:fix_android_package
2013-02-11 14:04:07 +04:00
Andrey Kamaev
5335c2f920
Merge pull request #464 from asmaloney:missing_fclose
2013-02-11 14:03:51 +04:00
Andrey Kamaev
d92a56ee2d
Merge pull request #458 from taka-no-me:tbb_4.1u2
2013-02-11 14:03:11 +04:00
Andrey Kamaev
cc79f40e2b
Merge pull request #454 from asmorkalov:android_samples_reorganize
2013-02-11 14:02:54 +04:00
Andrey Kamaev
2a98c1f89c
Merge pull request #446 from AnnaKogan8:updated-perf-timing-script
2013-02-11 14:02:39 +04:00
Andrey Kamaev
81832d76a8
Fix build of package for Google Play
2013-02-11 12:59:37 +04:00
Alexander Smorkalov
d067dc5a05
Code review notes fixed.
2013-02-11 11:36:12 +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
4045e6e588
Update tbb to version 4.1 update 2
2013-02-08 18:45:24 +04:00
Andrey Kamaev
46ca5c32cd
Merge pull request #455 from AlexeySpizhevoy:2.4
2013-02-08 18:45:24 +04:00
Andrey Kamaev
bb25111d23
Merge pull request #452 from asmorkalov:android_tutorial_update
2013-02-08 18:43:57 +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
c7e7b77093
Tutorial for Android synchronized with actual application framework.
2013-02-08 16:53:06 +04:00
Andrey Kamaev
6ffd5edfb5
Merge pull request #442 from asmorkalov:linux_cross_compile
2013-02-08 14:37:09 +04:00
