Alexander Alekhin
e6171d17f8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-18 12:49:52 +03:00
Dmitry Kurtaev
58ac3e09da
Change default value of crop argument of blobFromImage from true to false
2018-09-12 19:02:58 +03:00
Suleyman TURKMEN
d8cd1d8fcc
Merge pull request #12246 from sturkmen72:move_enums
...
* Update core.hpp
* Update imgproc.hpp
* Update ImgprocTest.java
* Update CameraCalibrator.java
* Update OnCameraFrameRender.java
* Update FindContoursDemo.java
* Update IntroductionToSVMDemo.java
* Update NonLinearSVMsDemo.java
* Update IntroductionToPCADemo.java
* Update Smoothing.java
* Update MainActivity.java
* Update CalcBackProjectDemo1.java
* Update CornerSubPixDemo.java
* Update CornerDetectorDemo.java
* Update GoodFeaturesToTrackDemo.java
2018-08-24 11:11:34 +03:00
Alexander Alekhin
c6aa97c9aa
next(android): java3 -> java4
2018-04-10 18:09:54 +03:00
Alexander Alekhin
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
Vitaly Tuzov
51cb56ef2c
Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. ( #9468 )
2017-12-13 15:00:38 +03:00
jrobble
c67ad49378
Set swapRB to false in Caffe tests and examples.
2017-09-22 09:58:48 -04:00
Dmitry Kurtaev
72001dc13c
Android sample for DNN module
2017-09-03 12:58:10 +03:00
Alexander Alekhin
133b91a026
android: build fixes
...
- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+
2017-04-26 14:24:51 +03:00
Alexander Alekhin
876c2c0efd
Merge pull request #7678 from dec1:tag_3.0.0
2016-11-15 19:35:38 +00:00
Declan Moran
a49e50a33b
fix error when building android sample:
...
https://github.com/opencv/opencv/issues/7590
2016-11-15 15:02:10 +01:00
Alexander Alekhin
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
Suleyman TURKMEN
11ca1c95f8
update cpp samples and tutorials
2016-06-26 20:55:00 +03:00
Alexander Alekhin
491a3fdebc
android samples: force setVisibility (see #5812 )
2015-12-16 14:31:49 +03:00
qubick
5502f0b45d
surfaceview import
2015-12-15 12:35:21 -07:00
qubick
1434f55cb9
camera view was enabled to visible when the app launched
2015-12-15 11:38:56 -07:00
Andrey Pavlenko
24ca6aaada
fix build with CMake
...
now it builds by the command:
`cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`
2015-10-08 13:48:46 +03:00
Andrey Pavlenko
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
Andrey Pavlenko
a041105491
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
2015-10-08 01:26:54 +03:00
Andrey Pavlenko
74fcefedcb
giving a chance for OpenCL 1.1 devices
2015-08-27 14:05:32 +03:00
Andrey Pavlenko
8031742817
unused imports clean-up
2015-08-27 14:05:31 +03:00
Andrey Pavlenko
43b76e548b
adding NO_PROCESSING
(i.e. just preview) mode
2015-08-27 14:05:31 +03:00
Andrey Pavlenko
016011fdf8
fixing start faulure on some devices; syncronization improvements
2015-08-27 14:05:31 +03:00
Alexander Alekhin
03bab0fc0d
tutorial-4-opencl: enable build with OpenCV
2015-08-13 13:32:23 +03:00
Alexander Alekhin
e1ad86c1fa
android samples: update way to attach native part of OpenCV
...
OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
2015-08-12 18:37:29 +03:00
Andrey Pavlenko
56bde913d4
adding mode switching via menu
2015-07-31 03:39:26 +03:00
Andrey Pavlenko
9ab291ea1c
adding displaying FPS
2015-07-31 01:52:10 +03:00
Andrey Pavlenko
0185cb27eb
excluding libOpenCL.so from the APK
2015-07-30 23:18:45 +03:00
Andrey Pavlenko
c8f863dfc5
minor fixes
2015-07-29 00:13:35 +03:00
Andrey Pavlenko
0e4bb2b49f
adding OpenCV with TAPI (UMats)
2015-07-27 04:04:56 +03:00
Andrey Pavlenko
274aba1a89
adding OpenCL processing (Image2D-to-Image2D only, others will be added later)
2015-07-27 02:57:01 +03:00
Andrey Pavlenko
2a6d4b6ee2
Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet.
2015-07-27 01:07:56 +03:00
Maksim Shabunin
bfa77ff5a4
Increase android samples versions
2015-06-17 18:10:28 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Maksim Shabunin
231685133e
OpenCV Manager: support 3.0.0 library
2015-03-19 15:27:14 +03:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Maksim Shabunin
c42424f2db
Fixed android samples build
2014-09-08 23:22:29 +04:00
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
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
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
07c0d50edf
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
2014-06-24 21:16:09 +04:00
Neo Alienson
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08: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