opencv/modules/ocl/doc
Roman Donchenko aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
..
images Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
camera_calibration_and_3D_reconstruction.rst ocl: update documentation 2013-11-05 23:53:51 +04:00
data_structures.rst ocl: update documentation 2013-11-05 23:53:51 +04:00
feature_detection_and_description.rst Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
image_filtering.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
image_processing.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
introduction.rst ocl: update documentation 2013-11-05 23:53:51 +04:00
matrix_reductions.rst documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
ml_machine_learning.rst speeded up ocl::distanceToCenters 2013-11-06 20:02:31 +04:00
object_detection.rst Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
ocl.rst Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
operations_on_matrices.rst fix documentation warning 2013-10-08 16:49:20 +02:00
structures_and_utility_functions.rst ocl: update module documentation 2013-10-03 23:26:06 +04:00
video_analysis.rst Added a citation which used to be in the gpu module in 2.4. 2013-11-11 18:00:55 +04:00