third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4f74e2509b
opencv/modules/ocl/src
History
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
..
cl_runtime ocl: update autogenerated code 2013-10-18 15:47:11 +04:00
opencl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
arithm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
bgfg_mog.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
blend.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
brute_force_matcher.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
build_warps.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
canny.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_context.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_operations.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
cl_programcache.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_programcache.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
columnsum.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
error.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
fft.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
filtering.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
gemm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
gftt.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
haar.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
hog.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
hough.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-08 17:57:23 +04:00
imgproc.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
interpolate_frames.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
kalman.cpp fixing typo 2013-10-25 18:00:46 +04:00
kmeans.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
knearest.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
match_template.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
matrix_operations.cpp Merge pull request #1704 from SpecLad:merge-2.4 2013-10-29 13:13:05 +04:00
mcwutil.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
moments.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
mssegmentation.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
optical_flow_farneback.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
precomp.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrdown.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrlk.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrup.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
safe_call.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
sort_by_key.cpp fixing typo 2013-10-25 18:00:46 +04:00
split_merge.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
stereo_csbp.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
stereobm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
stereobp.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
svm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
tvl1flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00