Open Source Computer Vision Library
Go to file
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
3rdparty Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
android Merge branch '2.4' 2013-04-12 15:35:38 +04:00
apps Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
cmake Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
data Merge release 2.4.4 2013-03-04 19:43:49 +04:00
doc updated sources to correct buildbot warnings 2013-04-30 17:32:47 +02:00
include Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
ios enabled png and jpeg for iOS 2013-03-25 11:19:29 +04:00
modules Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
platforms Merge branch '2.4' 2013-04-05 21:11:59 +04:00
samples Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
.gitattributes Revise git attributes 2013-02-28 03:18:54 +04:00
.gitignore Changed the file .gitignore 2012-08-28 17:46:45 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
CONTRIBUTING.md Add contributing page for Github 2013-04-15 16:57:58 +04:00
index.rst adding OpenCV Manager 2012-06-21 14:50:05 +00:00
README updating README content 2012-07-24 17:59:55 +04:00

OpenCV: open source computer vision library

Homepage:    http://opencv.org
Online docs: http://docs.opencv.org
Q&A forum:   http://answers.opencv.org
Dev zone:    http://code.opencv.org