vbystricky
|
fd51c133df
|
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
|
2014-07-21 15:10:41 +04:00 |
|
Alexander Alekhin
|
15b6fd2ec4
|
android: allow to build & run examples without Android OpenCV Manager
|
2014-06-06 18:01:04 +04:00 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Alexander Smorkalov
|
7da3e98dfd
|
Application pause/resume fix for Android sample NativeActivity.
|
2014-02-13 16:47:02 +04:00 |
|
Roman Donchenko
|
3609bb41a7
|
Updated the native activity sample to master's API.
|
2013-09-09 18:17:02 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Alexander Smorkalov
|
69b308a368
|
Various fixes in android sample NativeActivity.
|
2013-07-05 14:08:37 +04:00 |
|
Alexander Smorkalov
|
a39a9f677f
|
NativeActivity sample build with Eclipse CDT fixed.
|
2013-06-10 11:06:28 +04:00 |
|
Andrey Pavlenko
|
8c40f0ccf2
|
fixing build and lint warnings
|
2013-04-16 15:30:43 +04:00 |
|
Alexander Smorkalov
|
7bd169caa9
|
Native activity build with Android.mk fixed.
|
2013-04-09 10:17:22 +04:00 |
|
Alexander Smorkalov
|
f89cc191a4
|
Waning fixes for Android samples
|
2013-04-05 12:17:45 +04:00 |
|
Alexander Smorkalov
|
3929a43873
|
Native activity install fixed.
|
2013-04-03 14:43:23 +04:00 |
|
Alexander Smorkalov
|
f2fe89c6d8
|
CMakeLists.txt for Android native activity added.
|
2013-04-01 12:38:26 +04:00 |
|
Alexander Smorkalov
|
b37d65ff2b
|
Code refactoring was done.
|
2013-03-18 17:36:48 +04:00 |
|
Alexander Smorkalov
|
dc2bca0772
|
Initialization with Manager instead static link added.
|
2013-03-18 10:37:11 +04:00 |
|
Alexander Smorkalov
|
436d9bbcbb
|
Base for Native Activity example added.
|
2013-03-18 10:37:11 +04:00 |
|