4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
2012-11-27 12:46:49 +04:00
3fa630639f
fixed bayer2bgra in case when size.width <= 2
2012-11-26 19:45:56 +04:00
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
6ccd7aca4c
fix tests for arm
2012-11-22 13:26:13 +04:00
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
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
2e2d927273
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
2012-11-14 17:30:06 +04:00
52a136227d
Modified documentation for calcOpticalFlowSF.
2012-11-14 14:27:41 +04:00
e3c93ad9cf
Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4
...
This reverts commit 7e301c5c0eb5e009eb87
2012-11-13 23:52:18 +04:00
be40bd5c74
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
2012-11-13 23:37:44 +04:00
9cfa51a483
added CV_OUT to StereoVar output paramiter
2012-11-13 23:17:54 +04:00
1edab12068
fix for negative confidence
2012-11-13 23:08:19 +04:00
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
0938358002
Merge pull requests #136 , #142 , #150 , #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix
2012-11-13 19:47:16 +04:00
72a63922d2
Merge pull request #156 from jet47/gpu-hough-lines-fix
2012-11-13 18:24:36 +04:00
e4fb680566
Merge pull request #155 from jet47/gpu-test-fix
2012-11-13 18:23:52 +04:00
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +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
c803cbb93b
Merge pull request #143 from vpisarev/bug_fixes4
2012-11-13 18:17:33 +04:00
a9919e01d0
fixed bug in gpu::HoughLines
2012-11-13 17:54:17 +04:00
606c23b9aa
fixed gpu module tests
...
uses old CommandLineParser class
2012-11-13 17:50:29 +04:00
96e4eed018
Logcat message for disabled test cases added.
2012-11-13 11:41:08 +04:00
9f5fcff3ea
More common way of test case disabling implemented.
2012-11-13 10:29:49 +04:00
bd9ca48fab
export to python/java
2012-11-13 02:49:35 +04:00
e06c5b6fd5
Code review comments applied.
2012-11-12 17:47:20 +04:00
baef62b4d2
Java test fix. Eclipse test execution fix.
2012-11-09 11:46:14 +04:00
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +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
665bf430d5
fix warnings under win
2012-11-09 00:07:32 +04:00
2e54e2a586
fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.
2012-11-08 16:15:04 +04:00
9163471987
improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525 )
2012-11-08 14:09:43 +04:00
8a3e897999
min and max params become double
2012-11-08 02:34:49 +04:00
e379771c03
git warning
2012-11-08 02:34:49 +04:00
f93cffaa0d
fix compilation under win
2012-11-08 02:34:49 +04:00
1022094dc0
fix levels computing
2012-11-08 02:34:49 +04:00
f1e36043e6
clean code
2012-11-08 02:34:49 +04:00
4656872161
fixed typo
2012-11-08 02:34:49 +04:00
5fb9f48360
fix angle scaling
2012-11-08 02:34:49 +04:00
31a073ca66
documentation
2012-11-08 02:34:49 +04:00
4207552e19
add object init
2012-11-08 02:34:49 +04:00
Ilya Lavrenov