Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Alexander Smorkalov
11885e86ee
Feature #2833 Sepia size in Image Manipulations demo implemented.
2013-02-26 11:25:33 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
d067dc5a05
Code review notes fixed.
2013-02-11 11:36:12 +04:00
Alexander Smorkalov
9a2d6f854b
Tutorial-1-Java -> Tutorial-1-CameraPreview
...
Issues fix.
2013-02-08 13:13:37 +04:00
Alexander Smorkalov
507e2dc0ad
Project files for Eclipse updated.
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
b558bb4894
Tutorial-5 -> Tutorial-3
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
902463b6e9
Tutorial4 sample renamed to Tutorial-2-MixedProcessing
2013-02-08 12:50:07 +04:00
Alexander Smorkalov
08cd51df1f
Tutorial-3 removed as dublicate part of tutorial-4.
2013-02-08 12:47:45 +04:00
Alexander Smorkalov
b943277559
Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.
2013-02-08 12:47:23 +04:00
Alexander Smorkalov
33502c86ac
Tutorial 1 renamed
2013-02-08 12:45:48 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
6b5eac328f
Android samples updated according onCameraFrame callback signature change.
...
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.
2013-02-04 17:43:46 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Pavlenko
dd8e648d78
hiding empty menu button on Android 4
2012-12-25 17:49:10 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Alexander Smorkalov
77df8730ef
Tutorial-5 sample extended.
...
Application menu reorganized;
Resolution control added.
2012-12-20 11:16:34 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
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
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
