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 |
|
Alexander Alekhin
|
15b6fd2ec4
|
android: allow to build & run examples without Android OpenCV Manager
|
2014-06-06 18:01:04 +04:00 |
|
Roman Donchenko
|
339dd983ee
|
Adjusted the camera calibration sample to master API.
|
2013-08-13 14:55:27 +04:00 |
|
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 |
|
Daniil Osokin
|
65c5c4df70
|
Fixed build of camera calibration android sample
|
2013-08-08 09:31:25 +04:00 |
|
Roman Donchenko
|
2f780ed994
|
Fix whitespace errors.
|
2013-08-06 18:07:00 +04:00 |
|
Daniil Osokin
|
23c802b4cd
|
Added camera calibration sample for android
|
2013-07-26 01:19:32 +04:00 |
|