Alexander Smorkalov
3282e08f55
Default native library path for native camera updated.
...
New versions tries to search library in arm-v7a and Manager packages only.
2012-11-22 12:40:25 +04:00
Alexander Smorkalov
845e52b676
OpenCV Manager headers refactoring.
...
All constants moved to android independent header file.
2012-11-22 12:39:06 +04:00
Andrey Kamaev
8579666b03
Merge pull request #171 from asmorkalov:android_8_neon_fix
2012-11-21 14:55:38 +04:00
Andrey Kamaev
24af691843
Merge pull request #168 from asmorkalov:android_42_camera_fix
2012-11-21 14:50:53 +04:00
Alexander Smorkalov
8ecd22ba48
Automatic minsdkversion setup added;
...
Linker problems on armeabi-v7a+NEON with Android 2.2 fixed;
2012-11-21 14:03:11 +04:00
Vadim Pisarevsky
c31f106012
Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4
2012-11-21 11:43:18 +04:00
Alexander Smorkalov
aa4e6a8a83
Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
...
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
2012-11-21 11:37:29 +04:00
Andrey Kamaev
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
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
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
Andrey Kamaev
4fce5a5e83
Merge pull request #170 from asmorkalov:engine_build_fix
2012-11-20 18:27:43 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
d3397a1d6d
Merging pull request #167 from asmorkalov:java_api_manager_test
2012-11-20 17:53:06 +04:00
Alexander Smorkalov
5b148083fe
Libinfo build fix;
...
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-20 17:39:45 +04:00
Andrey Kamaev
f172947ed5
Merging pull request #162 from taka-no-me/opencv
2012-11-20 17:33:34 +04:00
Andrey Kamaev
5527fc62f4
'Merging pull request 163 from asmorkalov/opencv'
2012-11-20 17:23:02 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Andrey Kamaev
ab9311947a
Update Android CMake toolchain for NDK r8c
2012-11-20 15:20:04 +04:00
Alexander Smorkalov
66a1ea7604
Test execution inside Eclipse fixed;
...
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +04:00
Alexander Smorkalov
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
2012-11-19 12:58:17 +04:00
Andrey Kamaev
9ca1162be8
Update URL for TBB download. Update to TBB 4.1 update 1
2012-11-19 11:43:28 +04:00
Andrey Kamaev
6cd70c83fb
Merge pull request #160 from asmorkalov/android_4_2_manager_fix
2012-11-16 17:44:34 +04:00
Andrey Kamaev
f6f1861a2f
Merge pull request #159 from asmorkalov/libinfo_install_fix
2012-11-16 17:44:02 +04:00
Andrey Kamaev
590d1d8118
Merge pull request #157 from vpisarev/bug_fixes5
2012-11-16 17:43:21 +04:00
Alexander Smorkalov
759863d95c
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
2012-11-16 17:01:25 +04:00
Alexander Smorkalov
1e0bff3268
Issue #2541 make install does not work for Android build fixed.
2012-11-15 11:24:41 +04:00
marina.kolpakova
a9f10e5cad
fixed compile without cuda
2012-11-14 20:34:17 +04:00
marina.kolpakova
0865227049
check if scaling values changed
2012-11-14 20:28:08 +04:00
marina.kolpakova
c3e4a52fbe
soft cascade sample
2012-11-14 20:11:18 +04:00
Andrey Kamaev
2e2d927273
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
2012-11-14 17:30:06 +04:00
marina.kolpakova
ee4f003e72
fixed typo
2012-11-14 14:49:38 +04:00
marina.kolpakova
781c04324e
refactor: PrefixSum
2012-11-14 14:47:00 +04:00
marina.kolpakova
a30bbda3bd
remove hardcoded values
2012-11-14 14:36:59 +04:00
LeonidBeynenson
52a136227d
Modified documentation for calcOpticalFlowSF.
2012-11-14 14:27:41 +04:00
marina.kolpakova
8acfbde68e
remove debug detect at scale method
2012-11-14 14:22:12 +04:00
marina.kolpakova
72e2b8b370
remove size constraints of input frame
2012-11-14 14:00:02 +04:00
marina.kolpakova
08910e81af
integrate pre-Kepler architectures
2012-11-14 12:40:44 +04:00
marina.kolpakova
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
marina.kolpakova
be40bd5c74
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
2012-11-13 23:37:44 +04:00
Alexander Mordvintsev
9cfa51a483
added CV_OUT to StereoVar output paramiter
2012-11-13 23:17:54 +04:00
marina.kolpakova
1edab12068
fix for negative confidence
2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
Andrey Kamaev
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
Andrey Kamaev
72a63922d2
Merge pull request #156 from jet47/gpu-hough-lines-fix
2012-11-13 18:24:36 +04:00
Andrey Kamaev
e4fb680566
Merge pull request #155 from jet47/gpu-test-fix
2012-11-13 18:23:52 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
Andrey Kamaev
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
2012-11-13 18:19:42 +04:00
