Alexander Mordvintesv 7db1f711f6 Merge branch 'master' of code.opencv.org:opencv ...

Conflicts:
	samples/python2/common.py
	samples/python2/feature_homography.py
	samples/python2/plane_ar.py
	samples/python2/plane_tracker.py

2012-08-07 23:21:56 +03:00

..

androidcamera

Warning fix. ifdefs for 4.1.1 added.

2012-07-31 13:20:36 +04:00

calib3d

updated doc on triangulatePoints (#2167)

2012-07-25 17:51:37 +04:00

contrib

Fixed build warnings (including error in FAST)

2012-08-06 19:10:55 +04:00

core

added SSE2-optimized 3x3 invert by Grigoriy Frolov

2012-08-07 17:59:52 +04:00

features2d

added description of FAST 5/8 and FAST 7/12 (by Vincent)

2012-08-07 18:17:30 +04:00

flann

comment fixed

2012-08-07 23:19:13 +03:00

gpu

HAVE_CUDA macro

2012-08-07 18:23:18 +04:00

highgui

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +04:00

imgproc

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +04:00

java

removing warnings on deprecated api when targeting to android-15+

2012-07-14 19:07:27 +00:00

legacy

quiet most of the OSX build warnings

2012-07-05 12:56:31 +00:00

ml

test

2012-07-25 18:26:07 +04:00

nonfree

fixed SURf according to clockwise descriptor convention

2012-07-25 13:08:05 +04:00

objdetect

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +04:00

ocl

Fix several documentation build warnings

2012-08-07 18:00:09 +04:00

photo

quiet most of the OSX build warnings

2012-07-05 12:56:31 +00:00

python

work on #2100: pyopencv_to functions now can receive argument information through ArgInfo structure. Non-contiguous input numpy arrays are copied. In case of non-contiguous output array the TypeError is thrown.

2012-08-07 21:03:17 +03:00

stitching

Minor fix in the DP based seam estimator

2012-08-07 16:24:21 +04:00

ts

Add git support to run.py

2012-08-07 14:30:36 +04:00

video

Fixed build warnings (including error in FAST)

2012-08-06 19:10:55 +04:00

videostab

Fixed Windows build warnings and configuration problem.

2012-06-30 20:45:01 +00:00

world

Shortened cmake script for opencv_world

2012-06-15 07:52:20 +00:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

refman.rst.in

Made reference manual table of contents autogenerated

2012-05-30 14:06:47 +00:00