Commit Graph

216 Commits

Author SHA1 Message Date
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
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
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
ab9311947a Update Android CMake toolchain for NDK r8c 2012-11-20 15:20:04 +04:00
Andrey Kamaev
6cd70c83fb Merge pull request #160 from asmorkalov/android_4_2_manager_fix 2012-11-16 17:44:34 +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
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
Alexander Smorkalov
dda2eb0f76 Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-12 12:57:09 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Kirill Kornyakov
c5fb2de887 Updated link to OpenCV for Android page in README.android 2012-11-01 22:28:46 +04:00
marina.kolpakova
9b92de9a88 Merge pull request #121 from branch asmorkalov:android_samples_fix 2012-11-01 19:11:53 +04:00
Alexander Smorkalov
fc085d9dbd info library for OpenCV added. 2012-10-31 20:48:37 +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
Alexander Smorkalov
da31e12fed CMake for OpenCV Manager updated;
Some repo normalization problems fixed;
Deprecated cmake keys removed;
Warning fixed.
2012-10-31 11:47:27 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Alexander Smorkalov
e7e14b20cd OpenCV Manager version ++. 2012-10-24 13:25:07 +04:00
Alexander Smorkalov
293063eed3 Code normalization problems fixed.
Rair hangs on library installation fixed.
2012-10-24 12:47:43 +04:00
Alexander Smorkalov
680fba7e0d Repo normalization problems fixed. 2012-10-24 12:46:36 +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
Andrey Kamaev
cb66dd8000 Normalize android/scripts/wincfg.cmd.tmpl 2012-10-19 15:06:32 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Alexander Smorkalov
0c70b45625 Clickable optin turned off. Text disapearing fixed. 2012-10-11 16:27:01 +04:00
Andrey Kamaev
c46affe63e android.toolchain.cmake: restore implicit link with math library for C++ objects
Ticket #2426
2012-10-11 16:10:01 +04:00
Alexander Smorkalov
eb189713ae Issue #2431 OpenCV Manager UI crashes at start fixed.
Data rase in OpenCV Manager connection fixed.
2012-10-11 14:39:42 +04:00
Alexander Smorkalov
306ed9801a Issue #2284 BaseLoaderCallback requires use of Activity fixed. 2012-10-10 11:44:01 +04:00
Alexander Smorkalov
705b4724cb ABI Compatibility config generator bug fix. 2012-10-09 18:30:58 +04:00
Alexander Smorkalov
9ab19691d4 OpenCV Manager documentation updated.
Diagram rendering script updated.
2012-10-09 10:34:40 +04:00
Alexander Smorkalov
601b87e3ed Java tests updated. Build fix. 2012-10-08 14:37:59 +04:00
Alexander Smorkalov
9085fbe1e0 Native cameras build script output colorized. 2012-10-05 18:00:20 +04:00
Alexander Smorkalov
d40a2c28c5 Ant build.xml and deps added. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
5ffbcf1e16 MIPS arch support added to OpenCV manager;
Internal OpenCV library in OpenCV Manager support added;
Unit tests improved, platform specific tests added, MIPS related tests added;
Code refactoring done.
2012-10-02 16:21:53 +04:00
Alexander Smorkalov
ad58e96581 Automation for build and test OpenCV Manager on several devices added. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
d64d76086e MIPS architecture support added. Native camera library built for MIPS device. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
b1d14f766d Bug with several "in use" labels fixed in OpenCV Manager UI. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
0105d0a241 "in use" label update fix in OpenCV Manager UI. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
92b0cc541e Minor bug fix in building all native camera libs for android 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
ada27b54eb NDK detection bug fix. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
dc5c7ee68f Link to OpenCV website updated. Full Manager version added to UI. Screen orientation fixed. 2012-09-14 17:45:29 +04:00
Alexander Smorkalov
d55e114f96 Issue #2357 OpenCV manager fails to determine hardware platfrom on Tegra2 fixed. 2012-09-14 17:45:29 +04:00
Vsevolod Glumov
415636a677 Fixed a minor issue in OpenCV4Android Reference. 2012-09-14 17:06:59 +04:00
Vsevolod Glumov
1052a0b4eb Fixed some language issues in OpenCV4Android Reference. 2012-09-14 11:10:53 +04:00
Andrey Kamaev
1e69d47ba5 Remove -g from Android complier flags in release mode (used by NDK but inconvenient for CMake) 2012-09-13 20:27:54 +04:00
Alexander Smorkalov
afe30d0f8a Native camera fix for Nexus 7 with Android JB. Camera build script updated. 2012-09-12 14:29:00 +04:00
Alexander Smorkalov
ccafed3d90 ABI compatibility check config generator updated. Command line params added. NDK searching added. 2012-09-12 11:18:28 +04:00
Alexander Smorkalov
ec8b79cc91 Small camera build script improvements. 2012-09-12 11:18:28 +04:00
Alexander Smorkalov
f22a3af483 Issue #2345 Adapt OpenCV Manager UI for different screen resolution partially fixed. Layout for small resolution added.
Layout for small display resolution added.
2012-09-11 17:10:26 +04:00