marina.kolpakova
9b92de9a88
Merge pull request #121 from branch asmorkalov:android_samples_fix
2012-11-01 19:11:53 +04:00
Vadim Pisarevsky
d9d4e8df6f
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
2012-11-01 16:37:39 +04:00
Andrey Kamaev
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
Alexander Smorkalov
34896529d5
Review comments applied.
2012-11-01 16:19:11 +04:00
Andrey Kamaev
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
Andrey Kamaev
7267d518d5
Fix build in Visual Studio 2005
2012-11-01 12:42:51 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b
Merge pull request #117 from vpisarev/doc_updates
2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb
Merge pull request #110 from vpisarev/test_fixes2
2012-10-31 16:52:50 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5
a minor bug fix for brute force
2012-10-31 16:01:56 +08:00
Vadim Pisarevsky
adc1d94e95
updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request
2012-10-30 15:25:46 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4
minor updates for doc redirections and tutorial images size
2012-10-30 15:06:13 +04:00
Alexander
b0106ca25e
Test data form features2d updated.
2012-10-30 15:05:09 +04:00
Andrey Kamaev
f3a158c862
Merge pull request #102 from NikoKJ/ocl4_2.43
2012-10-30 13:01:57 +04:00
NikoKJ
9ccdd17376
eliminate all the warnings on win32 and win64
...
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
2012-10-30 13:01:42 +04:00
Vadim Pisarevsky
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
marina.kolpakova
0f65dacb8b
Merge pull request #104 from AoD314:master
2012-10-29 15:12:52 +04:00
marina.kolpakova
e55b2f7d60
Merge pull request #99 from jet47:tvl1-opt-flow
2012-10-29 15:00:40 +04:00
morozov.andrey
e0cfc0ccf5
fixed bug with incorrect syntax in CommandLineParser
2012-10-26 19:46:17 +04:00
Andrey Kamaev
ad982f4ed6
Turn off video IO perf tests on Android
2012-10-26 17:00:31 +04:00
Andrey Kamaev
fcad269e53
Specify sanity threshold for WarpPerspective perf test
2012-10-26 17:00:31 +04:00
Andrey Kamaev
84934f7bfc
Fix SHORT data type support in Algorithm
...
* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages
2012-10-26 17:00:13 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
016b2cadb0
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
...
Some code refactoring done.
2012-10-26 13:30:20 +04:00
Alexander Smorkalov
9217095955
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
729d76ad09
Merge branch '2.4'
2012-10-25 15:32:48 +04:00
Andrey Kamaev
bbb2d27add
Merge pull request #74 from taka-no-me/cl2cpp
2012-10-25 14:56:53 +04:00
Andrey Kamaev
63397e825c
Cleanup CMakeLists.txt of ocl module
2012-10-25 14:55:37 +04:00
Andrey Kamaev
42414b5689
Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4
2012-10-25 14:52:50 +04:00
Vladislav Vinogradov
8db5b7d7d4
fixed warnings under Windows
2012-10-25 13:28:30 +04:00
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
marina.kolpakova
772586801b
Merge pull request #87 from jet47:cmd-parser-fix
2012-10-25 00:40:50 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
ca20228956
Merge pull request #95 from apavlenko/perf-test/warp
2012-10-24 15:39:53 +04:00
Andrey Kamaev
6c5922542e
Merge pull request #97 from asmorkalov/2.4
2012-10-24 15:02:05 +04:00
Vadim Pisarevsky
ae10ecd264
fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)
2012-10-24 14:41:15 +04:00
Alexander Smorkalov
4f0f6686d1
Undefind behavior in Async Service Helper fixed.
2012-10-24 12:28:31 +04:00
Andrey Pavlenko
a94e80bea3
fixing typos in perf tests for warp funcs
2012-10-24 11:21:58 +04:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
LeonidBeynenson
d6aa3bd8ed
Made changes in cv::Algorithm
...
made it to give more verbose errors when arguments of wrong types are passed, added setters with types (e.g. setInt, etc)
2012-10-23 21:37:27 +04:00
Andrey Kamaev
080b9bbcd3
Merge pull request #80 from apavlenko/android-samples-refactor
2012-10-23 20:53:59 +04:00
Andrey Kamaev
b88323afc3
Merge pull request #91 from taka-no-me/warnings/windows
2012-10-23 20:52:42 +04:00
Andrey Kamaev
f14a711bda
Merge pull request #85 from Nerei/master
2012-10-23 20:47:56 +04:00
Andrey Kamaev
9b149edde6
Merge pull request #90 from taka-no-me/version_2.4.3-rc
2012-10-23 20:36:51 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
641ee645ab
New sample framework integrated to Java part of SDK;
...
Frame format setter added to both views.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Andrey Kamaev
1a500813f6
Remove dead blobtrackingkalman.cpp
2012-10-23 18:20:07 +04:00
Andrey Kamaev
9751014067
Fix warnings from MSVC 10 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
0072078857
Hide non-windows variable in gtest
2012-10-23 18:09:49 +04:00
Andrey Kamaev
1d8729a7aa
Don't use _interlockedExchangeAdd in case of GNU compiler
2012-10-23 18:09:49 +04:00
Andrey Kamaev
15b7b01243
Merge pull request #86 from taka-no-me/test/python_kmeans
2012-10-23 18:03:52 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
Andrey Kamaev
08e4298a96
Merge pull request #84 from Daniil-Osokin/perfTest-warpPerspective
2012-10-23 17:35:05 +04:00
Daniil Osokin
e9ba5c225d
extended perf test warpPerspectiveLarge
2012-10-23 16:06:03 +04:00
Andrey Kamaev
e64bb3654a
Remove wrong assertion
2012-10-23 15:28:44 +04:00
Vladislav Vinogradov
26f9534544
fixed string->string conversion
2012-10-23 15:24:21 +04:00
Anatoly Baksheev
d681717702
warnings
2012-10-23 15:13:46 +04:00
Andrey Kamaev
585f3bc391
Disable perf test for unstable solvePnPRansac
2012-10-23 12:13:39 +04:00
Andrey Kamaev
b45a870d9a
Limit 32S data in perf test for addWeighted to avoid integer overflow
2012-10-23 12:07:32 +04:00
Andrey Kamaev
c13eb07d47
Fix argument parsing for old command line parser
2012-10-23 12:07:01 +04:00
Andrey Kamaev
22e352d9cc
Merge pull request #76 vpisarev/test_fixes_1
2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
2012-10-22 21:13:26 +04:00
Andrey Kamaev
781d89829f
Merge pull request #79 from taka-no-me:warnings
2012-10-22 20:56:53 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
Andrey Kamaev
15076f9232
Fix implementation of PCA overload with retained variance parameter
2012-10-22 18:46:20 +04:00
Andrey Kamaev
d0ec65e80c
Fix linux build warning
2012-10-22 18:38:22 +04:00
Andrey Kamaev
9900f8deb2
Remove russian comments
2012-10-22 17:24:43 +04:00
Andrey Kamaev
ecb707ca7b
Convert cl2cpp.py script to cmake
...
New version removes inner comments and empty lines
2012-10-22 17:19:55 +04:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
Andrey Kamaev
769f61f8c7
Merge pull request #55 from vpisarev/ocl_fixes
2012-10-22 16:40:18 +04:00
Andrey Kamaev
d1d6ce63fc
Merge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 16:27:10 +04:00
Vadim Pisarevsky
eea6fe8e7f
Merge pull request #71 from NikoKJ/ocl4_2.4.3
...
This patch is for the ocl module of 2.4.3
(tested on Mac (OSX 10.8, Xcode 4.5, OpenCL 1.1(?))
2012-10-22 04:57:42 -07:00
marina.kolpakova
8e2f729aa7
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
2012-10-22 13:16:27 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
Maria Dimashova
78dd1893bb
added tests for cv::merge, cv::split, cv::phase
2012-10-21 12:22:39 +04:00
marina.kolpakova
b14f447cc6
fix GPU SURF tests for masked case
2012-10-21 11:40:08 +04:00
marina.kolpakova
99c666691e
Restore core multiply/divide depth to CV_64F value.
...
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests for multiply/device functions.
2012-10-21 11:20:39 +04:00
Kazuki MATSUDA
72c93dabd3
Add stream operators (Requested #2430 )
...
Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.
And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_)
2012-10-20 11:19:42 +09:00
Andrey Kamaev
b6a2717c2b
Merge pull request #65 from taka-no-me:android/warnings
2012-10-19 20:49:19 +04:00
Andrey Kamaev
59452dfc6f
Merge pull request #64 from vpisarev/bugs_1939_2100
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
40a30b6f30
fixed type "compatible -> incompatible" in the error message
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
d652cc72f2
fixed bugs #2100 (kind of) and #1393
...
[edit: cleaned whitespace]
2012-10-19 20:47:57 +04:00
Andrey Kamaev
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
Andrey Kamaev
e8dd73798c
Merge pull request #59 from taka-no-me:doc/fix-signatures-master
2012-10-19 15:03:26 +04:00
Andrey Kamaev
546ec2af65
Merge pull request #54 from taka-no-me:doc/fix-signatures
2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
09abcd567e
Merge pull request #50 from taka-no-me:parallel/fix-build-2445
2012-10-19 14:57:08 +04:00
Andrey Kamaev
7173c82382
Include unistd.h to parallel.cpp on UNIX-like systems
...
This fixes build without TBB and CUDA. Issue #2445
2012-10-19 14:38:30 +04:00
Vladislav Vinogradov
34b4a35ea7
gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types
2012-10-19 12:41:14 +04:00
