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

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp

2013-12-16 15:02:12 +04:00

..

opencl

Merge pull request #1954 from pentschev:ocl_features2d_fast_master

2013-12-12 17:37:09 +04:00

arithm.cpp

OCL: included sqrt matrix operation.

2013-12-12 08:57:27 -02: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-12-10 12:51:00 +04:00

build_warps.cpp

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

2013-11-26 15:05:26 +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-12-16 15:02:12 +04:00

cl_operations.cpp

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

2013-12-10 12:51:00 +04:00

cl_programcache.cpp

Replaced most of the instances of "s = s +" with "s +=".

2013-11-22 17:59:56 +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-26 15:05:26 +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

fast.cpp

OCL: including FAST feature detector.

2013-12-11 21:23:27 -02:00

fft.cpp

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +04:00

filtering.cpp

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

2013-11-26 15:05:26 +04:00

gemm.cpp

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +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

refactored CascadeClassifier to hide implementation details (take 2)

2013-12-04 19:00:39 +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/master' into merge-2.4

2013-11-26 15:32:44 +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 remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-26 15:05:26 +04:00

mcwutil.cpp

Replaced most of the instances of "s = s +" with "s +=".

2013-11-22 17:59:56 +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-12-03 17:35:21 +04:00

optical_flow_farneback.cpp

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

2013-11-26 15:05:26 +04:00

precomp.hpp

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +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

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +04:00

sort_by_key.cpp

Some hacks to build and run OpenCL on Qualcomm S800.

2013-11-22 16:13:38 +04:00

split_merge.cpp

Replaced most of the instances of "s = s +" with "s +=".

2013-11-22 17:59:56 +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