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
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
2012-11-13 18:19:42 +04:00
4d6bdc1533
Merge pull request #145 from taka-no-me/vec_print
2012-11-13 18:18:48 +04:00
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
0a4ed2bc01
Fix Windows build warnings
2012-11-09 10:10:04 +04:00
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
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
9163471987
improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525 )
2012-11-08 14:09:43 +04:00
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
9a08b7be45
fixed compile problem with the old Xcode (<4.5)
2012-11-02 15:29:16 +04:00
f2af0e7a57
Merge pull request #132 from taka-no-me/version-2.4.3
2012-11-02 14:31:30 +04:00
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
4a2f626d85
Remove "-rc" suffix from version
2012-11-02 14:27:34 +04:00
1c77f0abfe
Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()
2012-11-01 22:28:46 +04:00
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
5ce9965459
Merge pull request #125 from taka-no-me:perf_tests
2012-11-01 19:31:33 +04:00
09dec4e873
Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb
2012-11-01 19:26:30 +04:00
d9d4e8df6f
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
2012-11-01 16:37:39 +04:00
e3be5f138a
Fixed sanity checks in several performance tests
2012-11-01 16:29:30 +04:00
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
e0cfc0ccf5
fixed bug with incorrect syntax in CommandLineParser
2012-10-26 19:46:17 +04:00
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
729d76ad09
Merge branch '2.4'
2012-10-25 15:32:48 +04:00
42414b5689
Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4
2012-10-25 14:52:50 +04:00
772586801b
Merge pull request #87 from jet47:cmd-parser-fix
2012-10-25 00:40:50 +04:00
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
ae10ecd264
fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)
2012-10-24 14:41:15 +04:00
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
b88323afc3
Merge pull request #91 from taka-no-me/warnings/windows
2012-10-23 20:52:42 +04:00
f14a711bda
Merge pull request #85 from Nerei/master
2012-10-23 20:47:56 +04:00
9b149edde6
Merge pull request #90 from taka-no-me/version_2.4.3-rc
2012-10-23 20:36:51 +04:00
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
1d8729a7aa
Don't use _interlockedExchangeAdd in case of GNU compiler
2012-10-23 18:09:49 +04:00
15b7b01243
Merge pull request #86 from taka-no-me/test/python_kmeans
2012-10-23 18:03:52 +04:00
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
e64bb3654a
Remove wrong assertion
2012-10-23 15:28:44 +04:00
26f9534544
fixed string->string conversion
2012-10-23 15:24:21 +04:00
d681717702
warnings
2012-10-23 15:13:46 +04:00
b45a870d9a
Limit 32S data in perf test for addWeighted to avoid integer overflow
2012-10-23 12:07:32 +04:00
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
15076f9232
Fix implementation of PCA overload with retained variance parameter
2012-10-22 18:46:20 +04:00
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
d1d6ce63fc
Merge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 16:27:10 +04:00
78dd1893bb
added tests for cv::merge, cv::split, cv::phase
2012-10-21 12:22:39 +04:00
Andrey Kamaev