Commit Graph

266 Commits

Author SHA1 Message Date
Alexander Smorkalov
d550f95347 Date and time added to saved file name. 2012-12-07 14:46:53 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Alexander Smorkalov
22484872fa Sample Tutorial-5 improved
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
2012-11-30 18:41:46 +04:00
Andrey Kamaev
60a98aa5f7 Merge pull request #199 from apavlenko/remove_android_tutorial0
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
Andrey Pavlenko
ea83d384c1 removing Android tutorial 0 since it has become irrelevant after moving to the new application framework 2012-11-30 12:32:16 +04:00
Alexander Smorkalov
d36f8b9eb3 Code review comments applied
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov
86f7a357ae Tutorial-5 functionality implemented. 2012-11-27 18:06:43 +04:00
Alexander Smorkalov
24c920a33a Base for new sample added. 2012-11-27 18:06:43 +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
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
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
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
04481d9ef4 Fix Android build with clang compiler 2012-11-20 15:20:04 +04:00
Alexander Smorkalov
91a9923dcf Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package. 2012-11-09 09:40:19 +04:00
Alexander Smorkalov
95b7f5c46c Face Detection sample namespace replaced on org.opencv.facedetect for consistency with Google Play. 2012-11-07 13:27:33 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +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
Andrey Kamaev
468eefe0ce Merge branch '2.4' 2012-10-30 15:10:17 +04:00
Alexander
d495daf1ed Memory leak of native OpenCV mats fixed. 2012-10-29 16:56:21 +04:00
Alexander Smorkalov
83d8bc8c55 Tutorial 1 updated. Execution time camera switching implemented.
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +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
Alexander Smorkalov
c1d42664bc Refactring. Bug fix. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046 Code review coments fixed. Lint wornings fixed. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
4c06d0834e camera-preview sample removed from CMakeLists.txt 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
84856fa2c1 CMakeLists.txt rescued. Androidmanifest unified. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a5ee07d340 Image manipulations sample ported on new framework. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
898320a0f6 Code clean up. 2012-10-23 20:06:58 +04:00
Alexander Smorkalov
c64ee44c9e Color blob detection sample ported on new framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
2fd8b51a26 Face detection sample ported on new framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
d9ea16ce57 Tutorial1 ported on new framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
873f47654a Tutorial2 ported on new framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
31763bdcf0 Tutorial3 ported on new framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
50500e5923 Tutorial4 ported on new sample framework. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0 openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK. 2012-10-23 20:06:33 +04:00
Alexander Smorkalov
68ab3d5be6 Processing thread added to Java camera view. 2012-10-23 20:06:32 +04:00
Alexander Smorkalov
8393fd0c9d Auto focus added;
Old Android support added;
Android 4.1.x fixes added;
Thead sync added;
Camera errors handling added.
2012-10-23 20:06:32 +04:00
Alexander Smorkalov
f8bcff8ff3 Device rotation support added;
Nexus 7 support added.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
09901fae2b OnResume/OnPause handlers added to start/stop camera.
OpenCV initialization moved to onResume event to support package installation waiting.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
cc3430dbcc Naming fixed;
Warnings fixed;
Nexus 7 support added to manifest.
2012-10-23 20:04:09 +04:00
Konstantin Bezruk
cd152c3a03 Puzzle15 implementation with use of the OpenCV surface framework 2012-10-23 20:02:46 +04:00
Alexander Smorkalov
5f1339b319 Menu and style removed from sample. 2012-10-23 20:02:46 +04:00
Andrey Pavlenko
a32004f90c adding initial version of a sample with new Camera-View handling design 2012-10-23 20:01:23 +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
Andrey Kamaev
26bcb3812c Fix binary compatibility of opencv_contrib 2012-10-17 02:09:28 +04:00
Andrey Kamaev
dbd30d4fba Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
This reverts commit eb4ce67dac.

Conflicts:
	samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Alexander Smorkalov
a91de25f10 Build fix after issue #2284 fix. 2012-10-10 14:27:17 +04:00
Andrey Pavlenko
a8e7f91e34 java samples fix (clear view before drawing frame) of 'dirty' FPS display bug 2012-09-28 18:21:22 +04:00
Andrey Kamaev
e564a53ccd Add gitignore for Android tests and samples 2012-09-10 15:48:57 +04:00
Andrey Kamaev
067744d071 Fix Android samples for devices having front camera only (Nexus 7) 2012-08-31 18:25:08 +04:00
Andrey Kamaev
fc93518449 Fix package name of Android color blob detection sample 2012-08-31 17:47:12 +04:00
Andrey Kamaev
bd12f636c8 Unify manifest files in Android examples 2012-08-31 17:47:12 +04:00
Andrey Kamaev
cd59cf3ab5 Fixed java camera release in Android tutorial-0 sample 2012-08-28 20:37:06 +04:00
Andrey Kamaev
47b9640785 Updated package version in Android samples 2012-08-28 15:07:42 +04:00
Andrey Kamaev
ba862ffdff Fix/workaround bogus error in Android samples running on Android 4.1.1 2012-08-24 16:24:53 +04:00
Andrey Kamaev
e9e0668549 Fix crash on resume in face detection sample 2012-08-24 16:24:53 +04:00
Andrey Kamaev
285af48040 Fix Andoid samples: black screen after resume problem 2012-08-24 16:17:42 +04:00
Alexander Smorkalov
a1d8091e10 ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed. 2012-08-16 16:52:53 +04:00
Andrey Pavlenko
794b07ba11 removing unused files 2012-07-24 23:58:52 +04:00
Andrey Pavlenko
e16ae33a17 removing unused file 2012-07-24 23:55:14 +04:00
Andrey Pavlenko
dc68a56bab fixing wording 2012-07-15 05:51:29 +00:00
Andrey Pavlenko
92e6aa5f17 customizing the 'Google Market error' message in samples 2012-07-14 19:49:00 +00:00
Andrey Pavlenko
4e4db94b6b removing warnings on deprecated api when targeting to android-15+ 2012-07-14 19:07:27 +00:00
Andrey Pavlenko
5ec9909b71 updating include dirs to make CDT project in Eclipse happy 2012-07-11 13:12:37 +00:00
Andrey Kamaev
620d122fc2 Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings 2012-07-05 07:58:40 +00:00
Andrey Kamaev
51f6127e0a Merged the recent fixes from 2.4 branch 2012-07-04 08:04:31 +00:00
Andrey Pavlenko
e2e6838da3 adding CDT Builder (via ndk-build.cmd) for JNI part 2012-07-02 13:15:16 +00:00
Alexander Smorkalov
3a88fc5aa9 Android samples renaming was done. Icon updated. 2012-07-02 10:06:08 +00:00
Andrey Pavlenko
42d830ec23 switching to dynamic linking 2012-06-28 07:51:19 +00:00
Andrey Pavlenko
3804ca3e20 changing package layout after 'make install' for Android build 2012-06-27 06:22:26 +00:00
Andrey Pavlenko
9efc1a689b fixing project properties 2012-06-26 15:25:00 +00:00
Alexander Smorkalov
b962bf75cf Sample3-native build fix. Dependency from OpenCV library project added. Scripts updated. 2012-06-26 13:24:12 +00:00
Alexander Smorkalov
369f2c4903 Color blob detection example updated for OpenCV Manager model. 2012-06-26 12:58:46 +00:00
Alexander Smorkalov
109e308763 Sample4-mixed was updated for OpenCV Manager model. 2012-06-26 12:57:43 +00:00
Alexander Smorkalov
0693073b98 Example3-native updated for OpenCV Manager model 2012-06-26 12:44:57 +00:00
Alexander Smorkalov
521b89e69d Sample 2 was updated for OpenCV Manager model. 2012-06-26 12:31:04 +00:00
Alexander Smorkalov
207f4fc53c Sample 1 updated for OpenCV Manager model. 2012-06-26 12:26:42 +00:00
Alexander Smorkalov
7a858885e6 Image manipulations sample updated for OpenCV Manager model. 2012-06-26 12:20:35 +00:00
Alexander Smorkalov
700b685575 Revision 8725 restored. Android sample FaceDetection updated according DetectionBasedTracker interface. 2012-06-25 17:12:19 +00:00
Alexander Smorkalov
80febef237 revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated. 2012-06-25 17:01:55 +00:00
Andrey Kamaev
bd901eb52d Reverted r8721 and r8725 (issue #2080) 2012-06-24 08:50:03 +00:00
Alexander Smorkalov
02170a0a58 Sample updated due to new DetectionBasedTracker interface. 2012-06-22 14:07:54 +00:00
Andrey Pavlenko
2984fa751e adding OpenCV Manager 2012-06-21 14:50:05 +00:00
Alexander Smorkalov
a3be73b5cc revisions 8681 and 8688 restored. Warning fixed.
Warning: changes beak binary compatibility
2012-06-21 14:37:28 +00:00
Andrey Pavlenko
0a58d8f139 moving to OpenCVLoader API 2012-06-21 14:06:23 +00:00
Andrey Kamaev
d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Andrey Pavlenko
0942244d6f 'call' added to android.bat call 2012-06-15 15:37:11 +00:00
Andrey Pavlenko
8bc9e52dcc fixing typo that breaks the build 2012-06-15 10:42:32 +00:00
Andrey Kamaev
2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Andrey Pavlenko
da7920ff85 auto-copy java.so to package 2012-06-06 09:22:53 +00:00
Alexander Smorkalov
3780685fe6 CodeReview #1512 notes fixed. 2012-05-31 12:26:29 +00:00
Alexander Smorkalov
5c528defb8 CodeReview #1511 notes upplied. 2012-05-31 10:54:37 +00:00
Andrey Pavlenko
eb4ce67dac fixing Java test and sample after moving drawContours() from Imgproc to Core 2012-05-29 11:04:04 +00:00
Kirill Kornyakov
5c13b8706f added fix_properties scripts for Android samples 2012-05-28 13:31:44 +00:00
Alexander Smorkalov
fc71745caf cv::Exception handling added. Multithreading bug fixed. 2012-05-22 14:47:40 +00:00
Alexander Smorkalov
b422d078f8 Face detection example updated. Dtetection base tracker mode added. 2012-05-22 12:21:26 +00:00
Andrey Pavlenko
e3fc405393 fix for #1954 (typos) 2012-05-17 19:36:38 +00:00
Andrey Pavlenko
5855c4905e Android samples are updated: onPause()/onResume() release/open camera, a message is shown on camera open error, minor fixes in code and resources 2012-05-17 14:51:04 +00:00
Alexander Smorkalov
abe16352d6 ColorBlobDetection example. Bug fix. Refactoring. 2012-05-12 07:38:31 +00:00
Alexander Smorkalov
bae8a88c53 Base version implemented. 2012-05-04 13:46:00 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Andrey Pavlenko
6d49b075d9 updating screen resolutions support settings 2012-03-29 15:41:38 +00:00
Andrey Pavlenko
74749fccbf fix for #1724: making Java samples compatible with Android 3.1+ targets 2012-03-28 15:32:01 +00:00
Andrey Kamaev
e72a23243b Reworked build scripts for Android Java API, tests and examples 2012-03-27 16:05:52 +00:00
Andrey Kamaev
9b2d7e19db Added "fat" mode for Java wrapper 2012-03-23 17:03:05 +00:00
Andrey Pavlenko
6708869425 updating Java samples to meet Java API changes 2012-03-22 07:25:29 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Pavlenko
5bea651e81 Java samples updated to be compatible with both old (2.2+) and new (3.0+) Android versions 2012-02-24 08:43:11 +00:00
Andrey Pavlenko
62591a1d5a #1283, Mat <->Bitmap converters are updated to support CV_8UC(1,3,4) & non-continuous Mat-s and RGBA_8888 & RGB_565 Bitmaps; Android samples project files are updated according to the latest SDK req-s. 2012-02-14 14:40:41 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Kirill Kornyakov
7d8f487b03 reverted occasional commit 2011-11-24 12:20:45 +00:00
Kirill Kornyakov
913811836a workaround for the case when perf system is used in external app without TBB 2011-11-24 12:06:38 +00:00
Andrey Kamaev
3bdb53e484 Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support. 2011-11-16 14:32:10 +00:00
Andrey Kamaev
e8032fa8e9 Fixed Android build with SDK revision 14 2011-10-21 08:35:34 +00:00
Andrey Kamaev
d9d74678a9 Java API: corrected names of methods in Utils class; fixed bug in DMatch (thank for Hussein Abdinoor); added new utility method loadResource 2011-08-09 11:46:27 +00:00
Andrey Kamaev
ccc356829c Fixed color conversion bug 2011-08-05 15:46:13 +00:00
Kirill Kornyakov
0595ca7454 reverted 2011-08-03 13:21:21 +00:00
Kirill Kornyakov
2a47ab6e08 java tests: minor updates 2011-08-03 13:12:39 +00:00
Andrey Pavlenko
fa0daa4809 Java API: fixing converters (copyData=true) and samples compilation
Testing: 1079/0/592
2011-08-03 11:57:00 +00:00
Andrey Kamaev
e7642f66d9 Fixed install terget for Android examples 2011-07-25 13:17:11 +00:00
Andrey Kamaev
ac7e16fdf6 Fixed camera output format handling 2011-07-25 12:32:33 +00:00
Andrey Kamaev
a17b693aa9 Fixed build of Android samples and tests 2011-07-24 20:44:20 +00:00
Andrey Pavlenko
3d9cb082c9 making CV data type to be int 2011-07-22 15:11:35 +00:00
Andrey Kamaev
ebf9916242 Fixed android samples; fixed cmake files 2011-07-22 13:34:25 +00:00
Andrey Kamaev
8782914fc8 Aded setPreviewDisplay call to java camera samples 2011-07-21 09:57:46 +00:00
Andrey Kamaev
930b2995eb Fixed Android samples; Fixed bugs in cmake (java module). 2011-07-19 17:07:01 +00:00
Andrey Kamaev
dfdb15be79 Added Java packages support to cmake 2011-07-19 15:37:17 +00:00
Andrey Kamaev
6932203349 Fixed Android samples; updated black list of enums. 2011-07-19 12:10:05 +00:00
Andrey Kamaev
d445903b31 Added FPS measurement to some Android samples 2011-07-19 11:06:27 +00:00
Andrey Kamaev
9e00cc59af Added face datection Android sample 2011-07-19 09:01:36 +00:00
Andrey Kamaev
5e3e283e30 Changed labels for some android samples 2011-07-19 07:40:26 +00:00
Andrey Kamaev
72541721a1 Added image-manipulations android sample, other samples are updated; added Mat.size method to java API. 2011-07-18 16:17:07 +00:00
Andrey Kamaev
cc3c034cf6 Android samples: class SampleViewBase which uses native camera is renamed. 2011-07-18 09:13:05 +00:00
Andrey Kamaev
be2c4ddbdd Android:
* Added manual port for getTextSize;
* Fixed bugs in "native camera" sample;
* Added 15-puzzle sample.
2011-07-16 22:31:47 +00:00
Andrey Kamaev
4cf1274327 Finished Android samples renaming 2011-07-15 16:50:41 +00:00
Andrey Kamaev
8288cc108d Continued Android samples renaming 2011-07-15 16:29:10 +00:00
Andrey Kamaev
7c6fc6e18a Android samples are renamed 2011-07-15 15:56:08 +00:00
Andrey Kamaev
cc447448ff Added native camera Android sample; Added manual port of VideoCapture class. 2011-07-15 14:03:53 +00:00
Andrey Kamaev
fae67e0b46 Refactored Android samples 2011-07-15 09:07:01 +00:00
Andrey Kamaev
72a55a4139 Refactored Android sample (1-java) 2011-07-15 07:18:45 +00:00
Andrey Kamaev
a9508d2f67 Fixed android sample 2011-07-15 04:46:24 +00:00
Andrey Kamaev
f97e5f7353 Modified Android samples 2011-07-14 13:39:25 +00:00
Andrey Kamaev
14bc6e3e6c Modified Android Samples 2011-07-14 12:47:07 +00:00
Andrey Kamaev
c52ab82bbf Minor Android samples fix 2011-07-14 10:48:48 +00:00
Andrey Kamaev
20ec29f22e Android samples are included into the Android package 2011-07-14 09:34:57 +00:00
Andrey Kamaev
4d8a261d99 Allowed spaces in path to OpenCV (tested only Android build) 2011-07-13 15:47:04 +00:00