Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +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
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +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 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
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
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
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
a942747046
Code review coments fixed. Lint wornings fixed.
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
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +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 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
47b9640785
Updated package version in Android samples
2012-08-28 15:07:42 +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
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 Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Alexander Smorkalov
3a88fc5aa9
Android samples renaming was done. Icon updated.
2012-07-02 10:06:08 +00:00
Andrey Pavlenko
9efc1a689b
fixing project properties
2012-06-26 15:25:00 +00:00
Alexander Smorkalov
369f2c4903
Color blob detection example updated for OpenCV Manager model.
2012-06-26 12:58:46 +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
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
