marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +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
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
Andrey Kamaev
dad56e202f
Rename sample & tutorial executables
2012-11-09 10:15:48 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01
Fix Windows build warnings
2012-11-09 10:10: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
Vladislav Vinogradov
beb377b38c
gpu implementation of Dual TV-L1 Optical Flow
2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +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
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
66b90d19a6
Merge pull request #81 from stephenfox/master
2012-10-31 16:59:45 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
3fb90abb76
added retina code tutorial
2012-10-30 15:06:13 +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
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27: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
Stephen Fox
9f8ce906f4
fix to documentation regarding CV_CAP_OPENNI_* in high gui userguide
...
fix comments to accurate match CV_CAP_OPENNI_* vs. wrong OPENNI_*
2012-10-22 23:18:46 -05:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
