Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
62353b7980
Boring changes - samples.
11 years ago
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
11 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
11 years ago
Roman Donchenko
339dd983ee
Adjusted the camera calibration sample to master API.
11 years ago
Daniil Osokin
65c5c4df70
Fixed build of camera calibration android sample
12 years ago
Roman Donchenko
2f780ed994
Fix whitespace errors.
12 years ago
Daniil Osokin
23c802b4cd
Added camera calibration sample for android
12 years ago
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
12 years ago
hbristow
2059972bf7
Preparing to rebase
12 years ago
Alexander Smorkalov
a39a9f677f
NativeActivity sample build with Eclipse CDT fixed.
12 years ago
caorong
a2adafd508
fix a bug(DetectorType never change)
...
changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!! it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType
12 years ago
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
12 years ago
poiuytrez
7dda8e2cb8
Link to bug tracker replaced by bug description
12 years ago
poiuytrez
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
12 years ago
poiuytrez
60bf018781
Fix android tutorial 3 second picture taken bug
12 years ago
Andrey Pavlenko
8c40f0ccf2
fixing build and lint warnings
12 years ago
Alexander Smorkalov
82c61eba49
Feature #2893 Create Java sample without layout.xml implemented.
12 years ago
Alexander Smorkalov
7bd169caa9
Native activity build with Android.mk fixed.
12 years ago
Andrey Kamaev
dd74a851f3
Fix build errors
12 years ago
Alexander Smorkalov
f89cc191a4
Waning fixes for Android samples
12 years ago
Alexander Smorkalov
3929a43873
Native activity install fixed.
12 years ago
Alexander Smorkalov
f2fe89c6d8
CMakeLists.txt for Android native activity added.
12 years ago
Alexander Smorkalov
b37d65ff2b
Code refactoring was done.
12 years ago
Alexander Smorkalov
dc2bca0772
Initialization with Manager instead static link added.
12 years ago
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
12 years ago
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
12 years ago
Alexander Smorkalov
11885e86ee
Feature #2833 Sepia size in Image Manipulations demo implemented.
12 years ago
Alexander Smorkalov
d067dc5a05
Code review notes fixed.
12 years ago
Alexander Smorkalov
9a2d6f854b
Tutorial-1-Java -> Tutorial-1-CameraPreview
...
Issues fix.
12 years ago
Alexander Smorkalov
507e2dc0ad
Project files for Eclipse updated.
12 years ago
Alexander Smorkalov
b558bb4894
Tutorial-5 -> Tutorial-3
12 years ago
Alexander Smorkalov
902463b6e9
Tutorial4 sample renamed to Tutorial-2-MixedProcessing
12 years ago
Alexander Smorkalov
08cd51df1f
Tutorial-3 removed as dublicate part of tutorial-4.
12 years ago
Alexander Smorkalov
b943277559
Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.
12 years ago
Alexander Smorkalov
33502c86ac
Tutorial 1 renamed
12 years ago
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.
12 years ago
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
12 years ago
Alexander Smorkalov
6b5eac328f
Android samples updated according onCameraFrame callback signature change.
...
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.
12 years ago
Andrey Pavlenko
dd8e648d78
hiding empty menu button on Android 4
12 years ago
Alexander Smorkalov
77df8730ef
Tutorial-5 sample extended.
...
Application menu reorganized;
Resolution control added.
12 years ago
Alexander Smorkalov
d550f95347
Date and time added to saved file name.
12 years ago
Alexander Smorkalov
22484872fa
Sample Tutorial-5 improved
...
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
12 years ago
Andrey Pavlenko
ea83d384c1
removing Android tutorial 0 since it has become irrelevant after moving to the new application framework
12 years ago
Alexander Smorkalov
d36f8b9eb3
Code review comments applied
...
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
12 years ago
Alexander Smorkalov
86f7a357ae
Tutorial-5 functionality implemented.
12 years ago
Alexander Smorkalov
24c920a33a
Base for new sample added.
12 years ago
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.
12 years ago
Andrey Pavlenko
b19f672843
( #2569 ) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
12 years ago
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.
12 years ago