Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
Alexander Smorkalov
|
fff91eef0b
|
Native camera libraries updated.
Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
|
2013-08-09 17:43:21 +04:00 |
|
Andrey Kamaev
|
940eedfb27
|
Finalize core headers reorganization
|
2013-04-03 14:10:03 +04:00 |
|
Andrey Kamaev
|
75513a46dc
|
Remove all include directives for <string>
|
2013-03-22 22:14:47 +04:00 |
|
Andrey Kamaev
|
29b544d83c
|
Use cv::String in Android camera wrapper
|
2013-03-22 22:14:43 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Andrey Kamaev
|
e3474878b6
|
Consistently use 4-digit library version
|
2013-01-18 14:57:55 +04:00 |
|
Andrey Kamaev
|
9944282b09
|
Fix build with STLPort from NDK r8d
|
2012-12-22 00:59:56 +04:00 |
|
Alexander Smorkalov
|
3282e08f55
|
Default native library path for native camera updated.
New versions tries to search library in arm-v7a and Manager packages only.
|
2012-11-22 12:40:25 +04:00 |
|
Alexander Smorkalov
|
aa4e6a8a83
|
Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
|
2012-11-21 11:37:29 +04:00 |
|
Andrey Kamaev
|
a201233b59
|
Fix warning in Android camera code
|
2012-09-10 19:44:59 +04:00 |
|
Alexander Smorkalov
|
7d4432df27
|
getWidth/getHeight optimized.
|
2012-09-10 17:08:35 +04:00 |
|
Alexander Smorkalov
|
86c7e183d2
|
Issue #2316 Change default libnative_camera path implemented.
|
2012-09-10 16:29:37 +04:00 |
|
Alexander Smorkalov
|
710e070990
|
Native camera issue on HTC One S fixed.
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
|
2012-09-07 17:22:47 +04:00 |
|
Andrey Kamaev
|
95d54196db
|
Android camera: fix logging macro
|
2012-08-28 13:30:11 +04:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Andrey Kamaev
|
a43c47d6cf
|
First version of native camera support for Android 3.x.x and 4.0.x
|
2012-01-18 14:33:39 +00:00 |
|
Andrey Kamaev
|
ac7e16fdf6
|
Fixed camera output format handling
|
2011-07-25 12:32:33 +00:00 |
|
Leonid Beynenson
|
c8a603d853
|
Fixed bug in the function of search of Android applicvation path.
|
2011-07-14 18:41:09 +00:00 |
|
Andrey Kamaev
|
1c96aac52e
|
Fixed several cross-compiling issues. Fixed cmake status report.
|
2011-07-02 15:12:07 +00:00 |
|
Andrey Kamaev
|
206aa50f86
|
Added Android native camera module
|
2011-06-16 18:00:41 +00:00 |
|