Andrey Kamaev
|
cbe22fb5d1
|
Android: always sort list of NDK toolchains
Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
|
2012-11-27 18:16:36 +04:00 |
|
Andrey Kamaev
|
03f402892d
|
Merge pull request #188 from asmorkalov:app_framework
|
2012-11-27 17:50:39 +04:00 |
|
Andrey Kamaev
|
930b580e0d
|
Merge pull request #189 from wswld:2.4
|
2012-11-27 17:48:55 +04:00 |
|
Vsevolod Glumov
|
0711e65972
|
Added a note to the android_dev_intro.rst.
|
2012-11-27 15:10:57 +04:00 |
|
Alexander Smorkalov
|
2e5a7284d2
|
Code review comments applied.
|
2012-11-27 14:55:49 +04:00 |
|
Alexander Smorkalov
|
e95fc27490
|
Samples updated
In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
|
2012-11-27 12:47:41 +04:00 |
|
Alexander Smorkalov
|
0efc32fc21
|
Attribure loading from layout improved.
OpenCV namespace added;
Default values for camera_id added;
Aditional constructor with cameraId added.
Resolution added to FPS message.
|
2012-11-27 12:47:41 +04:00 |
|
Alexander Smorkalov
|
8266eab8b4
|
OpenCV app framework improved
FPS meter added;
Camera switching posibility added;
Attributes loading for layout filed implemented.
|
2012-11-27 12:47:41 +04:00 |
|
Andrey Kamaev
|
214629b220
|
Merge pull request #187 from vpisarev:doc_fixes_2.4
|
2012-11-26 22:33:01 +04:00 |
|
Andrey Kamaev
|
dc3aa27be4
|
Merge pull request #183 from apavlenko:perf/android_filters_accuracy
|
2012-11-26 22:32:38 +04:00 |
|
Andrey Kamaev
|
8286e1a5f7
|
Merge pull request #185 from apavlenko:bug2569/simplify_samples_jni_code
|
2012-11-26 22:32:22 +04:00 |
|
Andrey Pavlenko
|
c36dcbcada
|
Increase accuracy interval for image filters on Android and other platforms when sensible
|
2012-11-26 22:29:05 +04:00 |
|
Vadim Pisarevsky
|
db965353f4
|
fixed a few compile errors/warnings in 2.4 branch of the docs
|
2012-11-26 18:48:23 +04:00 |
|
marina.kolpakova
|
39da17a02a
|
Merge pull requst #177 from cuda-geek/another-one-integral-fix
|
2012-11-26 18:10:21 +04:00 |
|
marina.kolpakova
|
a22edb037f
|
fixed typo
|
2012-11-26 17:57:56 +04:00 |
|
Andrey Pavlenko
|
b19f672843
|
(#2569) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
|
2012-11-26 17:32:10 +04:00 |
|
marina.kolpakova
|
7df45c0dcc
|
remove unnecessary copying in SURF
|
2012-11-25 03:26:50 +04:00 |
|
marina.kolpakova
|
91913364d6
|
reintegrate warp shuffle based integral
|
2012-11-25 03:21:51 +04:00 |
|
marina.kolpakova
|
5460cee9e9
|
fix cascade classifier GFF NMS for empty candidates vector
|
2012-11-25 03:19:24 +04:00 |
|
Andrey Kamaev
|
23011ffd81
|
Merge pull request #179 from cuda-geek:usr-bin-env-python
|
2012-11-24 19:24:01 +04:00 |
|
Andrey Kamaev
|
6eed90e5e8
|
Merge pull request #180 from mdim:fix_compile_error
|
2012-11-24 19:22:02 +04:00 |
|
Andrey Kamaev
|
901c0d80c3
|
Merge pull request #178 from cuda-geek:fix-2504
|
2012-11-24 19:20:53 +04:00 |
|
Maria Dimashova
|
97e36b9375
|
fix a compile error in case of building without highgui
|
2012-11-24 18:10:29 +04:00 |
|
marina.kolpakova
|
68d04d28b6
|
replace offsets in surf to simple copy for better speed
|
2012-11-24 16:50:29 +04:00 |
|
marina.kolpakova
|
be0c20b758
|
align grid by 4
|
2012-11-24 01:55:03 +04:00 |
|
marina.kolpakova
|
fceb62386d
|
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
|
2012-11-23 23:11:44 +04:00 |
|
marina.kolpakova
|
285d6320be
|
add #/usr/bin/env python to all python files
|
2012-11-23 22:57:22 +04:00 |
|
Andrey Kamaev
|
f45b5b13f1
|
Merge pull request #172 from asmorkalov:default_cam_lib_path
|
2012-11-23 14:31:04 +04:00 |
|
Andrey Kamaev
|
081887ee16
|
Merge pull request #174 from asmorkalov:full_sreen_fix
|
2012-11-23 14:30:48 +04:00 |
|
Alexander Smorkalov
|
2c67731a7b
|
Issue #2549 OpenCV Samples does not expand on full screen fixed.
All samples use application style in android manifest instead of system calls in onCreate event now.
|
2012-11-23 13:12:11 +04:00 |
|
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
|
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 |
|