Mathieu Barnachon 67525627db Merge remote-tracking branch 'upstream/master' into bow_desc ...

Conflicts:
	modules/features2d/src/bagofwords.cpp

2013-11-24 14:21:44 +01:00

..

androidcamera

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00

bioinspired

changed eps in Retina_OCL test

2013-11-22 12:35:46 +04:00

calib3d

…

contrib

…

core

ocl: disable tests

2013-11-23 18:13:32 +04:00

cuda

…

cudaarithm

…

cudabgsegm

…

cudacodec

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00

cudafeatures2d

…

cudafilters

…

cudaimgproc

Add missing limits include

2013-11-12 22:29:41 -05:00

cudalegacy

…

cudaoptflow

…

cudastereo

…

cudawarping

…

cudev

…

features2d

Merge remote-tracking branch 'upstream/master' into bow_desc

2013-11-24 14:21:44 +01:00

flann

…

highgui

Merge pull request #1824 from vpisarev:ocl_experiments5

2013-11-20 19:14:40 +04:00

imgproc

fixed kernel compilation in imgproc module

2013-11-21 18:23:57 +04:00

java

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00

legacy

…

matlab

…

ml

…

nonfree

another attempt to fix compile errors

2013-11-18 22:15:04 -05:00

objdetect

fixed few compile errors and doc build errors

2013-11-18 13:48:04 -05:00

ocl

Merge pull request #1824 from vpisarev:ocl_experiments5

2013-11-20 19:14:40 +04:00

optim

…

photo

added some diagnostic into Tonemap test

2013-11-18 23:14:44 -05:00

python

…

shape

…

softcascade

…

stitching

…

superres

updated patch to bring in the first functions with "transparent API"

2013-11-18 11:48:00 -05:00

ts

ocl/core: added prototype for tests

2013-11-22 18:37:44 +04:00

video

…

videostab

…

viz

Viz code beautification

2013-11-17 19:33:55 +04:00

world

…

CMakeLists.txt

…

refman.rst.in

…