Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp

2013-07-08 18:47:38 +04:00

..

opencl

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-08 18:47:38 +04:00

arithm.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

binarycaching.hpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

blend.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

brute_force_matcher.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

build_warps.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

canny.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

color.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

columnsum.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

error.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

fft.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

filtering.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

gemm.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

gfft.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

haar.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

hog.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

hough.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

imgproc.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

initialization.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

interpolate_frames.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

match_template.cpp

Merge pull request #810 from pengx17:master_fix_ocl_tmflag

2013-04-13 16:33:53 +04:00

matrix_operations.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-25 15:55:52 +04:00

mcwutil.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

moments.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

mssegmentation.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

optical_flow_farneback.cpp

Move function definition from header to cpp.

2013-06-28 10:52:39 +08:00

precomp.cpp

merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)

2012-07-16 17:08:14 +00:00

precomp.hpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

pyrdown.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

pyrlk.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

pyrup.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

safe_call.hpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

split_merge.cpp

Remove C API from OpenCL module

2013-04-12 14:37:02 +04:00

stereo_csbp.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

stereobm.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

stereobp.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-08 18:47:38 +04:00

tvl1flow.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-05-27 16:58:04 +04:00