Andrey Kamaev 7f542e391a Merge branch 2.4 ...

Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4

2012-11-20 19:12:00 +04:00

..

adaptiveskindetector.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

ba.cpp

Warning fixes continued

2012-06-09 15:00:04 +00:00

basicretinafilter.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

basicretinafilter.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

bowmsctrainer.cpp

Fix android build warnings

2012-09-04 17:44:23 +04:00

chamfermatching.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

chowliutree.cpp

added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters

2012-09-03 17:03:31 +04:00

colormap.cpp

Two colormaps removed from the list of colormaps, as they are no visually improved enhancement to a Jet colormap.

2012-06-16 08:33:48 +00:00

colortracker.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

contrib_init.cpp

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

detection_based_tracker.cpp

Merge branch 2.4

2012-11-20 19:12:00 +04:00

facerec.cpp

Merge branch 2.4

2012-11-13 19:54:48 +04:00

featuretracker.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

fuzzymeanshifttracker.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

gencolors.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

hybridtracker.cpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

imagelogpolprojection.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

imagelogpolprojection.hpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

inputoutput.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

lda.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

logpolar_bsm.cpp

fixed build under android

2012-06-10 09:44:47 +00:00

magnoretinafilter.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

magnoretinafilter.hpp

added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters

2012-09-03 17:03:31 +04:00

octree.cpp

Warning fixes continued

2012-06-09 15:00:04 +00:00

openfabmap.cpp

some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover

2012-09-23 20:57:34 +04:00

parvoretinafilter.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

parvoretinafilter.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

polyfit.cpp

added variational stereo correspondence (by Sergey Kosov) and polynomial fitting (by Onkar Raut)

2011-06-15 12:10:33 +00:00

precomp.cpp

added OpenCVFindIPP.cmake script, which will look for IPP installation at CMake configuration time. First, IPPROOT environment variable will be tested, if not found script will look at default install places.

2010-12-31 16:45:18 +00:00

precomp.hpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

retina.cpp

Warning fixes continued

2012-06-09 15:00:04 +00:00

retinacolor.cpp

updated code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper

2012-08-31 14:14:57 +02:00

retinacolor.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

retinafilter.cpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

retinafilter.hpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

rgbdodometry.cpp

Fix OS X build warnings

2012-10-22 20:33:14 +04:00

selfsimilarity.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

spinimages.cpp

fix for bug 2264

2012-10-08 02:37:22 +04:00

stereovar.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

templatebuffer.hpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00