Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
1ed507c065
Merge pull request #310 from taka-no-me:4digit_version
2013-01-19 12:03:04 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Alexander Smorkalov
4feae810fa
4 digit library version numeration implemented in OpenCV Manager
...
Code refactoring done.
OpenCV library version type changed to int.
Some UI labels updated.
OpenCV Manager verison incremented.
2013-01-18 11:42:48 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Kirill Kornyakov
e21f106159
Updated OpenCV Manager rst documentation
2012-12-25 17:50:31 +04:00
Kirill Kornyakov
def1745132
Updated readme.txt with desciption about different OCV Manager packages
2012-12-25 17:16:30 +04:00
Alexander Smorkalov
064bf167ad
OpenCV Manager crashes with exception (Bug #2660 )
...
String checking and range cheching added.
2012-12-24 18:05:48 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Andrey Kamaev
f22ee7f0df
Workaround "Segmentation fault" when built with gcc 4.7 from NDK r8d
2012-12-21 16:44:54 +04:00
Andrey Kamaev
b6efec5f8b
Add support for Android NDK r8d
2012-12-21 15:39:23 +04:00
Andrey Kamaev
0d00109f05
Merge pull request #244 from asmorkalov:manager_nonarm_fix
2012-12-20 17:21:59 +04:00
Alexander Smorkalov
ee144852f2
Hardware platform detection for non arm devices fixed.
2012-12-20 16:44:56 +04:00
Alexander Smorkalov
71e7d444d8
All OpenCV Manager compiler warrnings fixed.
2012-12-20 12:28:30 +04:00
Andrey Kamaev
c8b658fdb6
Merge pull request #237 from asmorkalov:android_make_install_fix
2012-12-19 22:09:04 +04:00
Andrey Kamaev
48f19fba76
Merge pull request #235 from asmorkalov:doc_manager_selection
2012-12-19 18:00:49 +04:00
Alexander Smorkalov
1555922228
OpenCV for Android SDK installation improved;
...
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
2012-12-19 17:28:46 +04:00
Andrey Kamaev
8763ad6c99
Fix ccache search in Android CMake toolchain.
2012-12-19 16:50:08 +04:00
Alexander Smorkalov
3c09b075fc
OpenCV Manager selection chapter added to documentation.
2012-12-18 18:34:51 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Alexander Smorkalov
f29c727ada
Tag "safe to remove" added to unused packages;
...
OpenCV Manager version++.
2012-12-11 12:36:01 +04:00
Andrey Kamaev
67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
Andrey Kamaev
49e038c724
Merge pull request #203 from asmorkalov/android_cam_stub
...
Native camera warper libraries build improvements
2012-12-10 08:07:48 -08:00
Andrey Kamaev
2bf56961c0
Merge pull request #204 from asmorkalov/manager_internal_lib
...
Feature #2565 implementation
2012-12-10 08:07:39 -08:00
Alexander Smorkalov
257d8df1d4
Bug with skiped packages fixed.
2012-12-06 14:11:30 +04:00
Alexander Smorkalov
d2ed8e5f30
Bug #2595 in OpenCV Manager fixed.
...
OpenCV Manager 2.x marks old 2.4.2 binary package for Tegra as "in use".
The latest version of OpenCV library compatible with platform is used now.
2012-12-05 18:03:42 +04:00
Alexander Smorkalov
4ebcf2b224
GetPublicName function removed for OpenCV LibraryInfo class;
...
Some OpenCV Manager UI behavior updates;
CMake build fix.
2012-12-05 13:19:28 +04:00
Alexander Smorkalov
0f64f847b2
Info library loading implemeneted.
2012-12-04 16:34:53 +04:00
Alexander Smorkalov
9823b7cd08
Internal version of OpenCV inside OpenCV Manager added to the list of installed packages.
2012-12-04 15:37:27 +04:00
Alexander Smorkalov
a0c504aabc
Initial stub for OpenCVLibraryInfo class added.
2012-12-04 15:36:52 +04:00
Alexander Smorkalov
be80ad1607
Native camera warper libraries build improved
...
Environment variables support added to Android tree path;
Default config updated to use env variable.
2012-12-03 13:25:44 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Andrey Kamaev
f6ca38a579
Adjust Android Manager version from 2.2 to 2.3
2012-11-30 17:09:30 +04:00
Andrey Kamaev
e1a4d22da6
Merge pull request #192 from taka-no-me/ndk_selection_fix
...
Android: always sort list of NDK toolchains
2012-11-28 07:17:49 -08:00
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
Alexander Smorkalov
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
2012-11-27 17:30:05 +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
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
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
