Maksim Shabunin
|
231685133e
|
OpenCV Manager: support 3.0.0 library
|
2015-03-19 15:27:14 +03:00 |
|
Alexander Alekhin
|
15b6fd2ec4
|
android: allow to build & run examples without Android OpenCV Manager
|
2014-06-06 18:01:04 +04:00 |
|
Roman Donchenko
|
029fce10c9
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
|
2013-05-21 17:19:23 +04:00 |
|
Andrey Pavlenko
|
8c40f0ccf2
|
fixing build and lint warnings
|
2013-04-16 15:30:43 +04:00 |
|
Andrey Kamaev
|
b44b920997
|
Merge branch '2.4'
|
2013-02-12 16:30:18 +04:00 |
|
Alexander Smorkalov
|
d067dc5a05
|
Code review notes fixed.
|
2013-02-11 11:36:12 +04:00 |
|
Alexander Smorkalov
|
9a2d6f854b
|
Tutorial-1-Java -> Tutorial-1-CameraPreview
Issues fix.
|
2013-02-08 13:13:37 +04:00 |
|
Alexander Smorkalov
|
507e2dc0ad
|
Project files for Eclipse updated.
|
2013-02-08 12:50:58 +04:00 |
|
Alexander Smorkalov
|
33502c86ac
|
Tutorial 1 renamed
|
2013-02-08 12:45:48 +04:00 |
|